GitLab

Bug: 1025213,1025220
Tbr: xiyuan@chromium.org
Change-Id: If2ecef3066504dc40eefe25b5d0c8add170b8b2e
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1917964
Commit-Queue: Tina Wang <tinazwang@chromium.org>
Reviewed-by: Tina Wang <tinazwang@chromium.org>
Cr-Commit-Position: refs/heads/master@{#715693}