Landing https://webrtc-review.googlesource.com/c/src/+/23881 on behalf of stevengatto@ TBR=glaznev Bug: webrtc:8545 Change-Id: I4358b93d2f4d934c497c4d3ee7e86e1fbc7a5fae Reviewed-on: https://webrtc-review.googlesource.com/24460 Reviewed-by: Henrik Andreassson <henrika@webrtc.org> Commit-Queue: Henrik Andreassson <henrika@webrtc.org> Cr-Commit-Position: refs/heads/master@{#20788}