Change-Id: I87fe1b4c0f72cc164e94ae63e7f544c0d15f39ab Bug: b/362910201, b/362909489 Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/362340 Reviewed-by: Artem Titov <titovartem@webrtc.org> Commit-Queue: Jeremy Leconte <jleconte@google.com> Cr-Commit-Position: refs/heads/main@{#43006}