3cea256806
The original CL is reviewed at https://codereview.webrtc.org/1415173005/ A silly mistake was made at the last patch set, and the CL was reverted. This CL is to fix and reland it. BUG= Review URL: https://codereview.webrtc.org/1422213003 Cr-Commit-Position: refs/heads/master@{#10574}