GitLab

Merge internal change: 89221001

R=rch@chromium.org

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

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