TBR=phoglund@webrtc.org Bug: webrtc:8850 Change-Id: Iebc55a12d3a021aafe753778069ac8c90ccf4d3a No-Try: True No-Presubmit: true Reviewed-on: https://webrtc-review.googlesource.com/48621 Reviewed-by: Mirko Bonadei <mbonadei@webrtc.org> Commit-Queue: Mirko Bonadei <mbonadei@webrtc.org> Cr-Commit-Position: refs/heads/master@{#21914}