Bug: b/42225151, b/337757868 Change-Id: I78c053cb47961ff86c001be3150dc1efb13870af Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/349481 Commit-Queue: Sergey Silkin <ssilkin@webrtc.org> Reviewed-by: Erik Språng <sprang@webrtc.org> Cr-Commit-Position: refs/heads/main@{#42218}