(The two functions are always called together anyway.) BUG=None Review-Url: https://codereview.webrtc.org/2784333005 Cr-Commit-Position: refs/heads/master@{#17502}