Moved from https://codereview.webrtc.org/3009093002/ TBR=hlundin-webrtc Bug: webrtc:8041 Change-Id: I33485629a6f1dcb86fd4242468841605e7d8a72a Reviewed-on: https://webrtc-review.googlesource.com/3440 Reviewed-by: Henrik Andreassson <henrika@webrtc.org> Commit-Queue: Henrik Andreassson <henrika@webrtc.org> Cr-Commit-Position: refs/heads/master@{#19949}