TBR=sakal@webrtc.org Bug: webrtc:6597,webrtc:8534 Change-Id: I39f96d9e0e6d604051b1cc13368dd44fc82b30b0 Reviewed-on: https://webrtc-review.googlesource.com/23622 Reviewed-by: Magnus Jedvert <magjed@webrtc.org> Commit-Queue: Magnus Jedvert <magjed@webrtc.org> Cr-Commit-Position: refs/heads/master@{#20719}