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