GitLab

Bug: 1067070, 1067050
Change-Id: Id6814d5875ea1df4472422fbfd3121e67cf0d7e2
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2137676
Commit-Queue: benjamin joyce <bjoyce@chromium.org>
Reviewed-by: Yaron Friedman <yfriedman@chromium.org>
Reviewed-by: Wei-Yin Chen (陳威尹) <wychen@chromium.org>
Cr-Commit-Position: refs/heads/master@{#757913}