GitLab

Merge internal change: 202544067

Change-Id: Ibf16eef2c6f61fe1e34920494a03a7ae5c93e433
Reviewed-on: https://chromium-review.googlesource.com/1119259Reviewed-by: Zhongyi Shi <zhongyi@chromium.org>
Commit-Queue: Ryan Hamilton <rch@chromium.org>
Cr-Commit-Position: refs/heads/master@{#571752}