GitLab

Also fix a bug in the bridge found by the tests.

BUG=571056

Review-Url: https://codereview.chromium.org/2458703003
Cr-Commit-Position: refs/heads/master@{#430359}