Bug: webrtc:7135, webrtc:14795 Change-Id: Ib2f434b59542d6d8a2b8a287047417b784187602 Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/290567 Reviewed-by: Danil Chapovalov <danilchap@webrtc.org> Auto-Submit: Per Kjellander <perkj@webrtc.org> Commit-Queue: Per Kjellander <perkj@webrtc.org> Cr-Commit-Position: refs/heads/main@{#39049}