TBR: phoglund@webrtc.org Bug: webrtc:6424 Change-Id: Idc70ecf9093786307cccec624f1edf11542afa6b Reviewed-on: https://webrtc-review.googlesource.com/83724 Reviewed-by: Niels Moller <nisse@webrtc.org> Commit-Queue: Niels Moller <nisse@webrtc.org> Cr-Commit-Position: refs/heads/master@{#23626}