GitLab

In crrev.com/634314 I forgot to upload the last changes addressing the
latest comments from perezju@. Transferring those tweaks into this
followup change.

Bug: 925453
Change-Id: If8293d9b63977082f645697bd8fb110fbaae5ceb
Reviewed-on: https://chromium-review.googlesource.com/c/1481299Reviewed-by: Juan Antonio Navarro Pérez <perezju@chromium.org>
Commit-Queue: Egor Pasko <pasko@chromium.org>
Cr-Commit-Position: refs/heads/master@{#634596}