Bug: b/42234864, b/337757868 Change-Id: Iad1a6ec4833868e3a8b60d85847c2d2367fefb88 Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/349720 Reviewed-by: Ilya Nikolaevskiy <ilnik@webrtc.org> Commit-Queue: Sergey Silkin <ssilkin@webrtc.org> Cr-Commit-Position: refs/heads/main@{#42224}