GitLab

Patchset 1 is the revert. Patchset 2 is the fix.

Bug: 916888
Change-Id: I16e2fc111c8ca6e3477414f4ed893bd4da0e2087
Reviewed-on: https://chromium-review.googlesource.com/c/1387386Reviewed-by: Demetrios Papadopoulos <dpapad@chromium.org>
Reviewed-by: Sam McNally <sammc@chromium.org>
Commit-Queue: Esmael El-Moslimany <aee@chromium.org>
Cr-Commit-Position: refs/heads/master@{#618366}