Bug: webrtc:9987, webrtc:10159 Change-Id: I7f56913e81bce0b5e1f05b8c3e8b848870f12f44 Reviewed-on: https://webrtc-review.googlesource.com/c/118937 Reviewed-by: Mirko Bonadei <mbonadei@webrtc.org> Commit-Queue: Karl Wiberg <kwiberg@webrtc.org> Cr-Commit-Position: refs/heads/master@{#26364}