TBR=jchinlee

Bug: 828154
Change-Id: I677acea5d4e32455fd2846c3ad9d61e43786b8d4
Reviewed-on: https://chromium-review.googlesource.com/993452Reviewed-by: Aaron Gable <agable@chromium.org>
Commit-Queue: Aaron Gable <agable@chromium.org>