This re-lands https://chromium-review.googlesource.com/#/c/323690/. It didn't break tryjobs, they actually didn't work.

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