GitLab

This is a companion change to https://codereview.chromium.org/696353005/.

BUG=412374,412376
R=smut@google.com, smut@chromium.org

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

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