Bug: webrtc:13517, webrtc:11993 Change-Id: If44c7a7428454c0bf5a6fee6d12d816e3dc8e27c Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/248163 Reviewed-by: Niels Moller <nisse@webrtc.org> Commit-Queue: Tomas Gunnarsson <tommi@webrtc.org> Cr-Commit-Position: refs/heads/main@{#35772}