This is a cleanup CL related to the work tracked by 9946. Bug: webrtc:9946 Change-Id: I3d879196af83856ece1418fa786aab03a3dd3c8c Reviewed-on: https://webrtc-review.googlesource.com/c/108820 Reviewed-by: Åsa Persson <asapersson@webrtc.org> Commit-Queue: Philip Eliasson <philipel@webrtc.org> Cr-Commit-Position: refs/heads/master@{#25466}