BUG=503611,577560

Change-Id: I4ecb2c6a01c81f6a93c8ff4a52b89789711b23a5
Reviewed-on: https://chromium-review.googlesource.com/322142Reviewed-by: Sergiy Byelozyorov <sergiyb@chromium.org>
Reviewed-by: Paweł Hajdan Jr. <phajdan.jr@chromium.org>
Tested-by: Andrii Shyshkalov <tandrii@chromium.org>