This CL contains a few minor changes to names, function signatures and merges two structs into one. BUG=5868 Review-Url: https://codereview.webrtc.org/1952923005 Cr-Commit-Position: refs/heads/master@{#12716}