TBR=phoglund@webrtc.org Bug: webrtc:8603 Change-Id: Ifb8df25ccb0358abcf92499a87b497cee2ab81b0 No-Try: True Reviewed-on: https://webrtc-review.googlesource.com/29103 Commit-Queue: Mirko Bonadei <mbonadei@webrtc.org> Reviewed-by: Edward Lemur <ehmaldonado@webrtc.org> Cr-Commit-Position: refs/heads/master@{#21086}