TBR=tandrii

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