GitLab

Previous change reverted because it was commited at the same time as
https://chromium-review.googlesource.com/673124 that caused conflict.

TBR=lpz@chromium.org

Bug: 761114
Change-Id: If9031596189dff08fec6ec3f0ef2db82544767ca
Reviewed-on: https://chromium-review.googlesource.com/690596Reviewed-by: Jialiu Lin <jialiul@chromium.org>
Commit-Queue: Jialiu Lin <jialiul@chromium.org>
Cr-Commit-Position: refs/heads/master@{#505186}