Bug: webrtc:7135, webrtc:14795 Change-Id: I0242a3600d4a156eae2315966e5e59e03be8aeab Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/290998 Commit-Queue: Per Kjellander <perkj@webrtc.org> Reviewed-by: Harald Alvestrand <hta@webrtc.org> Cr-Commit-Position: refs/heads/main@{#39139}