R=ajp@chromium.org

Bug: 881860
Change-Id: I2608132730cf907ea5bb86476490eafc37e24275
Reviewed-on: https://chromium-review.googlesource.com/1227438
Commit-Queue: Andrii Shyshkalov <tandrii@chromium.org>
Reviewed-by: Edward Lesmes <ehmaldonado@chromium.org>