Bug: webrtc:13869, webrtc:13846 Change-Id: I699ac4774f84cf891304b9c75434301f99ca55d6 Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/258500 Reviewed-by: Jonas Oreland <jonaso@webrtc.org> Reviewed-by: Mirko Bonadei <mbonadei@webrtc.org> Commit-Queue: Niels Moller <nisse@webrtc.org> Cr-Commit-Position: refs/heads/main@{#36569}