GitLab

Bug: 790536, 790521
Change-Id: I0479b74551bbd38841721ea549b198c6dfc2cdac
Reviewed-on: https://chromium-review.googlesource.com/956551Reviewed-by: John Budorick <jbudorick@chromium.org>
Commit-Queue: Shenghua Zhang <shenghuazhang@chromium.org>
Cr-Commit-Position: refs/heads/master@{#541969}