Bug: webrtc:9477, webrtc:11503 Change-Id: I65551a00c394aa39b0d30ecd343616e8142d1df1 Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/347522 Reviewed-by: Erik Språng <sprang@webrtc.org> Commit-Queue: Danil Chapovalov <danilchap@webrtc.org> Cr-Commit-Position: refs/heads/main@{#42082}