This was decided to be done in a separate CL from the move that took place in https://codereview.webrtc.org/1587193006/ BUG=webrtc:5420 NOTRY=True TBR=pthatcher@webrtc.org Review URL: https://codereview.webrtc.org/1676923002 Cr-Commit-Position: refs/heads/master@{#11520}