GitLab

And some minor clean-up. No behavior change.

Change-Id: Ia80a0c2a673e7a500267b591d857ba32ff8e53b9
Reviewed-on: https://chromium-review.googlesource.com/809226Reviewed-by: Eric Stevenson <estevenson@chromium.org>
Commit-Queue: agrieve <agrieve@chromium.org>
Cr-Commit-Position: refs/heads/master@{#521775}