Bug: webrtc:15368, webrtc:11943 Change-Id: Ia642fac641893649ac4d2160d2ef9d5738b11866 Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/328441 Commit-Queue: Jonas Oreland <jonaso@webrtc.org> Reviewed-by: Jonas Oreland <jonaso@webrtc.org> Auto-Submit: Per Kjellander <perkj@webrtc.org> Cr-Commit-Position: refs/heads/main@{#41230}