GitLab

This CL lands server changes 143452565 by birenroy and 143815813 by bnc.

BUG=488484

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