GitLab

Random fixups that the automated rewriting tool opted to skip.

BUG=110610

Review URL: https://codereview.chromium.org/578533002

Cr-Commit-Position: refs/heads/master@{#295135}