Bug: webrtc:6733, webrtc:8239 Change-Id: I8ac4464cd7a7ec2b2dbad44430f1141a80ba39c1 Reviewed-on: https://webrtc-review.googlesource.com/25541 Commit-Queue: Danil Chapovalov <danilchap@webrtc.org> Reviewed-by: Niels Moller <nisse@webrtc.org> Cr-Commit-Position: refs/heads/master@{#20904}