This CL is extracted from https://webrtc-review.googlesource.com/c/src/+/208584 Bug: webrtc:11340, webrtc:12470 Change-Id: I322c271b02bc3577fe8aad57fe97364a76d83f4f Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/227342 Commit-Queue: Erik Språng <sprang@webrtc.org> Reviewed-by: Danil Chapovalov <danilchap@webrtc.org> Cr-Commit-Position: refs/heads/master@{#34628}