Bug: webrtc:8603 Change-Id: I8126971f80310ad077a1e536c022a296612f573a No-Try: True Reviewed-on: https://webrtc-review.googlesource.com/30300 Reviewed-by: Edward Lemur <ehmaldonado@webrtc.org> Reviewed-by: Patrik Höglund <phoglund@webrtc.org> Commit-Queue: Mirko Bonadei <mbonadei@webrtc.org> Cr-Commit-Position: refs/heads/master@{#21162}