GitLab

Bug: 828468, 828443
Change-Id: Id790c23f48fda5d8f6444c5cf175e930f153c3ba
Reviewed-on: https://chromium-review.googlesource.com/1188583Reviewed-by: John Budorick <jbudorick@chromium.org>
Commit-Queue: Ned Nguyen <nednguyen@google.com>
Cr-Commit-Position: refs/heads/master@{#585883}