Bug: None Change-Id: I731513aabb45f006112c150ea0e213761cb0716e Reviewed-on: https://webrtc-review.googlesource.com/2680 Reviewed-by: Henrik Grunell <henrikg@webrtc.org> Commit-Queue: Niels Moller <nisse@webrtc.org> Cr-Commit-Position: refs/heads/master@{#19924}