Bug: webrtc:8637,chromium:794099 Change-Id: I46b4a7268fc03e5b3fbc93a334e07c507f78304f Reviewed-on: https://webrtc-review.googlesource.com/32200 Reviewed-by: Rasmus Brandt <brandtr@webrtc.org> Commit-Queue: Per Åhgren <peah@webrtc.org> Cr-Commit-Position: refs/heads/master@{#21219}