WIP changes #16865

Job	Run time
chromium_linux-x64 / initialize	1m 15s
linux / initialize	1m 19s
chromium_linux-x64 / docker-build-image	4m 7s
linux / docker-build-image	3m 24s
linux / x64_devel	5m 51s
linux / x64_debug	5m 36s
linux / x64_qa	5m 42s
linux / x64_gold	6m 1s
chromium_linux-x64 / x64_devel	5m 33s
chromium_linux-x64 / x64_debug	5m 39s
chromium_linux-x64 / x64_qa	5m 30s
chromium_linux-x64 / x64_gold	5m 22s
	55m 19s

Provide feedback