Bug: None Change-Id: I37a553d254cb61a882b98b14274c0fdfba039992 Reviewed-on: https://webrtc-review.googlesource.com/33002 Commit-Queue: Niels Moller <nisse@webrtc.org> Reviewed-by: Karl Wiberg <kwiberg@webrtc.org> Cr-Commit-Position: refs/heads/master@{#21281}