GitLab

BUG=490260,490240
TEST=as in bug

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

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