TBR=sakal@webrtc.org Bug: webrtc:8279 Change-Id: Ic2e5d169f11a0d4a88086d61f737f33ab9e86447 Reviewed-on: https://webrtc-review.googlesource.com/24220 Reviewed-by: Magnus Jedvert <magjed@webrtc.org> Commit-Queue: Magnus Jedvert <magjed@webrtc.org> Cr-Commit-Position: refs/heads/master@{#20881}