Bug: webrtc:9577, webrtc:10480 Change-Id: I6d58866d48b8eaaa4102551b88d4f55133d1915c Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/130482 Commit-Queue: Alessio Bazzica <alessiob@webrtc.org> Reviewed-by: Gustaf Ullberg <gustaf@webrtc.org> Cr-Commit-Position: refs/heads/master@{#27387}