GitLab

Bug: 706297
Bug: 683858
Change-Id: Ibb51dbacc26164ead556488da18fb322350fddff
Reviewed-on: https://chromium-review.googlesource.com/546697
Commit-Queue: Allen Bauer <kylixrd@chromium.org>
Reviewed-by: Scott Violet <sky@chromium.org>
Reviewed-by: Michael Wasserman <msw@chromium.org>
Cr-Commit-Position: refs/heads/master@{#485963}