GitLab

Merge internal change: 134721332

R=rch@chromium.org
BUG=

Review-Url: https://codereview.chromium.org/2391723003
Cr-Commit-Position: refs/heads/master@{#422823}