Bug: webrtc:6424, webrtc:13579 Change-Id: I222e1bfb62d5f1f1a2c74e5fce1038e04e7bebfb Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/255824 Reviewed-by: Ali Tofigh <alito@webrtc.org> Reviewed-by: Tomas Gunnarsson <tommi@webrtc.org> Commit-Queue: Niels Moller <nisse@webrtc.org> Cr-Commit-Position: refs/heads/main@{#36234}