BUG=webrtc:7760 Change-Id: Ieae3852d22cadf24cf4184ae985062918a85f02c Reviewed-on: https://chromium-review.googlesource.com/536237 Commit-Queue: Bjorn Mellem <mellem@webrtc.org> Reviewed-by: Sami Kalliomäki <sakal@webrtc.org> Reviewed-by: Peter Thatcher <pthatcher@webrtc.org> Cr-Commit-Position: refs/heads/master@{#18685}