GitLab

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

Change-Id: I301e0b34a206bd6bf382db0c5100ccf9bf67389a
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1781440Reviewed-by: Maksim Ivanov <emaxx@chromium.org>
Commit-Queue: Jit Yao Yap <jityao@google.com>
Cr-Commit-Position: refs/heads/master@{#693720}