GitLab

Bug: 936602, 936500
Change-Id: I9265a2950c185c90da7ee07210ab7ff63f4eb5f6
Reviewed-on: https://chromium-review.googlesource.com/c/1493081
Commit-Queue: Caleb Rouleau <crouleau@chromium.org>
Reviewed-by: John Chen <johnchen@chromium.org>
Cr-Commit-Position: refs/heads/master@{#636201}