GitLab

This is basically just a revert of https://crrev.com/c/1273620 but I
wanted to keep the comment improvements I made there.

Bug: 886988
Change-Id: Ie08bb820f9e2b6eac4b1eeb672332e2f9306fe0d
Reviewed-on: https://chromium-review.googlesource.com/c/1340787Reviewed-by: Tommy Li <tommycli@chromium.org>
Commit-Queue: Justin Donnelly <jdonnelly@chromium.org>
Cr-Commit-Position: refs/heads/master@{#609306}