TBR=stefan@webrtc.org Bug: webrtc:7925 Change-Id: I0bb97acdf0d58a9ce531ecdd672bb17ef96360df Reviewed-on: https://webrtc-review.googlesource.com/21162 Commit-Queue: Magnus Jedvert <magjed@webrtc.org> Reviewed-by: Anders Carlsson <andersc@webrtc.org> Reviewed-by: Rasmus Brandt <brandtr@webrtc.org> Cr-Commit-Position: refs/heads/master@{#20717}