R=katthomas@chromium.org,sergiyb@chromium.org
BUG=chromium:601260

Change-Id: I79e1e807d1f8aed8d294742974d1f42a852c6b13
Reviewed-on: https://chromium-review.googlesource.com/415147
Commit-Queue: Andrii Shyshkalov <tandrii@chromium.org>
Reviewed-by: Sergiy Byelozyorov <sergiyb@chromium.org>