7ea6e59735
(This is a re-land of https://codereview.webrtc.org/2995523002, with a narrowing conversion removed.) BUG=webrtc:7836, webrtc:7842 Review-Url: https://codereview.webrtc.org/2995993002 Cr-Commit-Position: refs/heads/master@{#19369}