Bug: webrtc:6898, webrtc:6333, webrtc:7861 Change-Id: Ie33eaa47585012f98b59ccffc0c849c1d9da54da Reviewed-on: https://webrtc-review.googlesource.com/79920 Reviewed-by: Anders Carlsson <andersc@webrtc.org> Reviewed-by: Henrik Andreassson <henrika@webrtc.org> Commit-Queue: Kári Helgason <kthelgason@webrtc.org> Cr-Commit-Position: refs/heads/master@{#23454}