Bug: webrtc:13065, webrtc:10947 Change-Id: Ia60343de90006d17dce92d30a4820a3dca5428cb Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/236300 Reviewed-by: Harald Alvestrand <hta@webrtc.org> Commit-Queue: Niels Moller <nisse@webrtc.org> Cr-Commit-Position: refs/heads/main@{#35261}