R=perkj@webrtc.org Review URL: https://webrtc-codereview.appspot.com/46869004 Cr-Commit-Position: refs/heads/master@{#8972}