GitLab

Merge internal change: 222419106

R=zhongyi@chromium.org

Change-Id: I78b6a3cc500b4e9b72a135f1c346373d89faf33d
Reviewed-on: https://chromium-review.googlesource.com/c/1394007Reviewed-by: Zhongyi Shi <zhongyi@chromium.org>
Commit-Queue: Zhongyi Shi <zhongyi@chromium.org>
Cr-Commit-Position: refs/heads/master@{#619769}