R=iannucci@chromium.org, nodir@chromium.org

Change-Id: If7d48775b01a55e884a4c1fd6c26b1ff65992f4e
Reviewed-on: https://chromium-review.googlesource.com/786823Reviewed-by: Robbie Iannucci <iannucci@chromium.org>
Commit-Queue: Andrii Shyshkalov <tandrii@chromium.org>