GitLab

During recent reviews there have been several nits reported. This
change fixes a few of them.

BUG=442566
TEST=updated tests pass

Review-Url: https://codereview.chromium.org/2169713002
Cr-Commit-Position: refs/heads/master@{#414267}