Bug: webrtc:8166, chromium:770690 Change-Id: I9480720c99308f8a2a3dcf407a07d762249f5a9c Reviewed-on: https://webrtc-review.googlesource.com/6840 Reviewed-by: Henrik Kjellander <kjellander@webrtc.org> Reviewed-by: Mirko Bonadei <mbonadei@webrtc.org> Commit-Queue: Niels Moller <nisse@webrtc.org> Cr-Commit-Position: refs/heads/master@{#20219}