Bug: webrtc:11340, webrtc:12470 Change-Id: I01a6262cfeb33d1900f8f3cd93cceee2ff73a8a0 Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/227643 Reviewed-by: Danil Chapovalov <danilchap@webrtc.org> Commit-Queue: Erik Språng <sprang@webrtc.org> Cr-Commit-Position: refs/heads/master@{#34646}