TBR=henrik.lundin Bug: webrtc:7744 Change-Id: I8e8adc666e4734a9333dc3eaa273f68d66a8d0af Reviewed-on: https://webrtc-review.googlesource.com/7260 Commit-Queue: Henrik Andreassson <henrika@webrtc.org> Reviewed-by: Henrik Andreassson <henrika@webrtc.org> Cr-Commit-Position: refs/heads/master@{#20183}