TBR=henrika@webrtc.org Bug: webrtc:7156 Change-Id: Ib00992cce0007e0b5c9274340df1a892f810b0c5 Reviewed-on: https://webrtc-review.googlesource.com/29202 Commit-Queue: Edward Lemur <ehmaldonado@webrtc.org> Reviewed-by: Henrik Andreassson <henrika@webrtc.org> Reviewed-by: Patrik Höglund <phoglund@webrtc.org> Cr-Commit-Position: refs/heads/master@{#21244}