TBR=henrika@webrtc.org,solenberg@webrtc.org Bug: webrtc:8482 Change-Id: Ib2738224e776618c692db95cd9473335bc17be15 Reviewed-on: https://webrtc-review.googlesource.com/17540 Commit-Queue: Björn Terelius <terelius@webrtc.org> Reviewed-by: Björn Terelius <terelius@webrtc.org> Cr-Commit-Position: refs/heads/master@{#20505}