Review-Url: https://codereview.webrtc.org/2320053003 Cr-Commit-Position: refs/heads/master@{#14211}
The changes are done in several patches in order to make the review easier. NOTRY=True BUG=webrtc:5949 Review-Url: https://codereview.webrtc.org/2051443002 Cr-Commit-Position: refs/heads/master@{#13068}