GitLab

In 1119610, there were some comments that were addressed, but the
updated patch was not uploaded by mistake. This patch just addresses
those comments.

TBR=yhanada@chromium.org, jamescook@chromium.org

Bug: 849980
Change-Id: Ida53707785789fda4b8ee687198932dd266477fb
Reviewed-on: https://chromium-review.googlesource.com/1124074
Commit-Queue: Darren Shen <shend@chromium.org>
Reviewed-by: Darren Shen <shend@chromium.org>
Cr-Commit-Position: refs/heads/master@{#572125}