GitLab

Sync server-side changes from
https://critique.corp.google.com/#review/251735875 to client.

Bug: None
Change-Id: I946bf7baeabfcd57575942493d363ec81efef155
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1660853
Commit-Queue: Jit Yao Yap <jityao@google.com>
Reviewed-by: Maksim Ivanov <emaxx@chromium.org>
Auto-Submit: Jit Yao Yap <jityao@google.com>
Cr-Commit-Position: refs/heads/master@{#669633}