R=jchinlee@chromium.org

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