TBR=kjellander@webrtc.org Bug: 738330 Change-Id: I5eb87ee2d08f4be73f00ebf9771b8f7c08dbadd3 Reviewed-on: https://webrtc-review.googlesource.com/1020 Commit-Queue: Aaron Gable <agable@chromium.org> Reviewed-by: Henrik Kjellander <kjellander@webrtc.org> Reviewed-by: Edward Lemur <ehmaldonado@webrtc.org> Cr-Commit-Position: refs/heads/master@{#19826}