Bug: webrtc:8982, webrtc:9185 Change-Id: I8a88c10725508f7ea8a7f46e8bcdac4afdb2c617 Reviewed-on: https://webrtc-review.googlesource.com/77681 Reviewed-by: Jonas Olsson <jonasolsson@webrtc.org> Reviewed-by: Oskar Sundbom <ossu@webrtc.org> Commit-Queue: Karl Wiberg <kwiberg@webrtc.org> Cr-Commit-Position: refs/heads/master@{#23359}