This CL is a minimum effort/low risk fix. Later CLs take a more thorough approach. Bug: webrtc:9634 Change-Id: I728a061a4e71b38a559ee438646de83cd2cb3517 Reviewed-on: https://webrtc-review.googlesource.com/94760 Commit-Queue: Erik Språng <sprang@webrtc.org> Reviewed-by: Rasmus Brandt <brandtr@webrtc.org> Cr-Commit-Position: refs/heads/master@{#24326}