GitLab

This patch also includes some minor cleanup.

Bug: 605657
Change-Id: Id7670c7743929cd638e25e0991cbfde2bc6fbb4d
Reviewed-on: https://chromium-review.googlesource.com/759378
Commit-Queue: Bret Sepulveda <bsep@chromium.org>
Reviewed-by: Devlin <rdevlin.cronin@chromium.org>
Cr-Commit-Position: refs/heads/master@{#515800}