TBR: gustaf@webrtc.org BUG: chromium:810951,webrtc:8872 Change-Id: I79194f964754d0f156a5206dbeb49606617e8bb5 Reviewed-on: https://webrtc-review.googlesource.com/50502 Commit-Queue: Per Åhgren <peah@webrtc.org> Reviewed-by: Per Åhgren <peah@webrtc.org> Cr-Commit-Position: refs/heads/master@{#21978}