TBR=noahric Bug: NONE Change-Id: Ie528b36cc03d53b15fbfd56a386309a8c3adce73 Reviewed-on: https://webrtc-review.googlesource.com/2681 Commit-Queue: Henrik Andreassson <henrika@webrtc.org> Reviewed-by: Henrik Andreassson <henrika@webrtc.org> Cr-Commit-Position: refs/heads/master@{#19927}