GitLab

This is a reland of http://crrev.com/3882aae7 since
http://crrev.com/40d8624d should have fixed the problem leading to
diff update failures.

BUG=340387
TEST=N/A

Review URL: https://codereview.chromium.org/596353002

Cr-Commit-Position: refs/heads/master@{#296428}