Tbr: mbonadei@webrtc.org Bug: webrtc:10198, webrtc:9719 Change-Id: I2b4dba285ef191b0e97069e789d6c8f0524156eb Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/179481 Reviewed-by: Niels Moller <nisse@webrtc.org> Commit-Queue: Niels Moller <nisse@webrtc.org> Cr-Commit-Position: refs/heads/master@{#31741}