GitLab

This cl merges server change 154325175 by yasong.

BUG=488484

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