GitLab

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