GitLab

Code clean up and no behavior change.

Bug: None
Change-Id: I503e2ada644d827be7a5fe8b3e7f228130287b36
Reviewed-on: https://chromium-review.googlesource.com/685299Reviewed-by: Achuith Bhandarkar <achuith@chromium.org>
Reviewed-by: Ahmed Fakhry <afakhry@chromium.org>
Commit-Queue: Xiyuan Xia <xiyuan@chromium.org>
Cr-Commit-Position: refs/heads/master@{#504464}