GitLab

Also some other insignificant changes I came across when looking into
this.

BUG=none
TEST=none

Change-Id: Ia0b831db631c7663d41ddb828d78338b40d7f228
Reviewed-on: https://chromium-review.googlesource.com/794632Reviewed-by: Ilya Sherman <isherman@chromium.org>
Commit-Queue: Scott Violet <sky@chromium.org>
Cr-Commit-Position: refs/heads/master@{#519885}