Bug: webrtc:13931, webrtc:14920 Change-Id: I451869e295e099a1d08c0c80e481decd53149f1b Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/294382 Reviewed-by: Henrik Boström <hbos@webrtc.org> Commit-Queue: Harald Alvestrand <hta@webrtc.org> Cr-Commit-Position: refs/heads/main@{#39373}