Change-Id: I9c7fdc695be1e424488fa46962d459c66cf4d1e7 Bug: webrtc:9068 Reviewed-on: https://webrtc-review.googlesource.com/64721 Reviewed-by: Oskar Sundbom <ossu@webrtc.org> Reviewed-by: Henrik Andreassson <henrika@webrtc.org> Commit-Queue: Tommi <tommi@webrtc.org> Cr-Commit-Position: refs/heads/master@{#22603}