R=tandrii@chromium.org, vadimsh@chromium.org

Bug: 809645
Change-Id: I21ad49fa03630955eca6ecd531445bc4acf0c0c6
Reviewed-on: https://chromium-review.googlesource.com/905822Reviewed-by: Vadim Shtayura <vadimsh@chromium.org>
Reviewed-by: Andrii Shyshkalov <tandrii@chromium.org>
Commit-Queue: Robbie Iannucci <iannucci@chromium.org>