GitLab

Also fixed lint and presubmit errors.

Change-Id: I559d8eed024d84b6fdc0bcc0e7d6019dadb4b5f2
Reviewed-on: https://chromium-review.googlesource.com/1162275Reviewed-by: Carlos Knippschild <carlosk@chromium.org>
Reviewed-by: Yafei Duan <romax@chromium.org>
Commit-Queue: Sky Malice <skym@chromium.org>
Cr-Commit-Position: refs/heads/master@{#581063}