GitLab

Simplify some code too.

Change-Id: I94dbf05f1090ee7d3ecd88e8e6ef7edd778494c2
Reviewed-on: https://chromium-review.googlesource.com/1043361Reviewed-by: Toni Barzic <tbarzic@chromium.org>
Commit-Queue: Lei Zhang <thestig@chromium.org>
Cr-Commit-Position: refs/heads/master@{#556104}