Bug: b/337757868, b/42234533 Change-Id: I3a5088c2ef64ebc48b37aa51b3ebb7cd395e537b Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/349960 Reviewed-by: Åsa Persson <asapersson@webrtc.org> Commit-Queue: Sergey Silkin <ssilkin@webrtc.org> Reviewed-by: Erik Språng <sprang@webrtc.org> Cr-Commit-Position: refs/heads/main@{#42280}