Bug: webrtc:11611, webrtc:11567, webrtc:7723 Change-Id: If69c9101f5ff9a5fd00da599e0a4c02c636a2e65 Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/176220 Reviewed-by: Mirko Bonadei <mbonadei@webrtc.org> Reviewed-by: Karl Wiberg <kwiberg@webrtc.org> Commit-Queue: Markus Handell <handellm@webrtc.org> Cr-Commit-Position: refs/heads/master@{#31372}