GitLab

Merge internal change: 183282622

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