R=terelius Bug: webrtc:8450 Change-Id: Iab262462e465bad8579b4275dba6cad6c90fff02 Reviewed-on: https://webrtc-review.googlesource.com/15441 Reviewed-by: Björn Terelius <terelius@webrtc.org> Commit-Queue: Patrik Höglund <phoglund@webrtc.org> Cr-Commit-Position: refs/heads/master@{#20558}