PSA: https://groups.google.com/forum/?pli=1#!topic/discuss-webrtc/wVztouO08gw Bug: webrtc:9139, webrtc:7504 Change-Id: I9587513509eb4609e8e4e2e112af58d920b4e334 Reviewed-on: https://webrtc-review.googlesource.com/70700 Reviewed-by: Karl Wiberg <kwiberg@webrtc.org> Commit-Queue: Fredrik Solenberg <solenberg@webrtc.org> Cr-Commit-Position: refs/heads/master@{#22952}