GitLab

Fixes were made to restore the functioning of the tests in commit
c9cee7e5.

Bug: 789192
Change-Id: I3ec2b8a2dd3a04f24dbcc3998ca3f7f138cc281f
Reviewed-on: https://chromium-review.googlesource.com/c/1334852Reviewed-by: Ned Nguyen <nednguyen@google.com>
Commit-Queue: Ned Nguyen <nednguyen@google.com>
Cr-Commit-Position: refs/heads/master@{#607898}