Bug: webrtc:10138, webrtc:10692 Change-Id: I4d7ae84dc2945fef6451a6671786b3b19cd9abd8 Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/139108 Commit-Queue: Artem Titov <titovartem@webrtc.org> Commit-Queue: Mirko Bonadei <mbonadei@webrtc.org> Reviewed-by: Ilya Nikolaevskiy <ilnik@webrtc.org> Reviewed-by: Karl Wiberg <kwiberg@webrtc.org> Cr-Commit-Position: refs/heads/master@{#28107}