Bug: None Change-Id: I4fdac7481ac73b1e6035802530c834e273fb3cdc Reviewed-on: https://webrtc-review.googlesource.com/38200 Reviewed-by: Mirko Bonadei <mbonadei@webrtc.org> Commit-Queue: Patrik Höglund <phoglund@webrtc.org> Cr-Commit-Position: refs/heads/master@{#21531}