This one was pretty straightforward fortunately. Bug: webrtc:6828 Change-Id: Ie7b5e71f1298c409dbca2c74eaa09c0986e41d8f Reviewed-on: https://webrtc-review.googlesource.com/25821 Commit-Queue: Patrik Höglund <phoglund@webrtc.org> Reviewed-by: Karl Wiberg <kwiberg@webrtc.org> Cr-Commit-Position: refs/heads/master@{#20914}