GitLab

Fix some small nits along the way.

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

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