GitLab

Fixed: 1156205, 1156201
Change-Id: Ic0f11263c2c128f12155effb56d2fd9a79e6e15e
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2577890
Commit-Queue: Javier Flores <javierrobles@chromium.org>
Reviewed-by: Michael Lippautz <mlippautz@chromium.org>
Reviewed-by: Mark Pearson <mpearson@chromium.org>
Cr-Commit-Position: refs/heads/master@{#842703}