Bug: webrtc:7600 Change-Id: I2a48426a29ac67b6bdbd7817fe07273cdd5fd980 Reviewed-on: https://webrtc-review.googlesource.com/31647 Commit-Queue: Steve Anton <steveanton@webrtc.org> Reviewed-by: Henrik Boström <hbos@webrtc.org> Reviewed-by: Peter Thatcher <pthatcher@webrtc.org> Cr-Commit-Position: refs/heads/master@{#21305}