Bug: webrtc:10138, webrtc:10683 Change-Id: I9235fef99d3ea857f10234fdd82e8468480f71a1 Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/138822 Reviewed-by: Ilya Nikolaevskiy <ilnik@webrtc.org> Commit-Queue: Artem Titov <titovartem@webrtc.org> Cr-Commit-Position: refs/heads/master@{#28078}