R=jchinlee@chromium.org

Bug: 830992
Change-Id: Ic18a6bc309661581be55dd39510d5223cefefc40
Reviewed-on: https://chromium-review.googlesource.com/1026631Reviewed-by: Jao-ke Chin-Lee <jchinlee@chromium.org>
Commit-Queue: Andrii Shyshkalov <tandrii@chromium.org>