GitLab

Also update some tests accordingly.

BUG=

Review URL: https://codereview.chromium.org/664313004

Cr-Commit-Position: refs/heads/master@{#300650}