Bug: webrtc:10792, webrtc:10138 Change-Id: I0559e28e31d21ff63154cf811f60bc9de757b7b9 Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/144522 Reviewed-by: Mirko Bonadei <mbonadei@webrtc.org> Commit-Queue: Artem Titov <titovartem@webrtc.org> Cr-Commit-Position: refs/heads/master@{#28461}