GitLab

This is a revert of http://crrev.com/1e5757d just for the two files here.

Bug: 841685
Change-Id: I4d6b211d45e2b2104b440daa8c8f6715fb6c5ab2
Reviewed-on: https://chromium-review.googlesource.com/1055678Reviewed-by: Ryan Hamilton <rch@chromium.org>
Commit-Queue: Nick Harper <nharper@chromium.org>
Cr-Commit-Position: refs/heads/master@{#557967}