BUG=chromium:611808 NOTRY=True NOTREECHECKS=True Change-Id: I9493a7e171dbd8198eaa4c4723690fafc851e144 Reviewed-on: https://webrtc-review.googlesource.com/1568 Commit-Queue: Henrik Kjellander <kjellander@webrtc.org> Reviewed-by: Mirko Bonadei <mbonadei@webrtc.org> Reviewed-by: Henrik Kjellander <kjellander@webrtc.org> Cr-Commit-Position: refs/heads/master@{#19848}