GitLab

This CL lands server changes 163065386 by clshepherd
and 164147233 by bnc.

BUG=488484

Change-Id: I2dd1d319e3221cc1ab356a04b6bf60374870fd83
Reviewed-on: https://chromium-review.googlesource.com/600732
Commit-Queue: Bence Béky <bnc@chromium.org>
Reviewed-by: Helen Li <xunjieli@chromium.org>
Cr-Commit-Position: refs/heads/master@{#491910}