GitLab

Change-Id: Ib142a395db29f8ed48c35b5f7c8ffc13cbce1fca
Bug: 830624, 826664
No-Try: True
Reviewed-on: https://chromium-review.googlesource.com/c/1346455
Commit-Queue: Henrik Grunell <grunell@chromium.org>
Reviewed-by: Lei Zhang <thestig@chromium.org>
Cr-Commit-Position: refs/heads/master@{#611086}