TBR=phoglund@webrtc.org Bug: webrtc:8603 Change-Id: I74c01d5a0243c96dca504b2d696092ea35c36aa3 No-Try: True Reviewed-on: https://webrtc-review.googlesource.com/29860 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@{#21105}