This reverts dc3bd3d721 (I385dca1d95) and re-applies d4ce0f3255 (Ib9fc34ca64). The CI failures have been addressed. Bug: T314008 Change-Id: I35a4f656c31b67ebb662bf6f6366f4ee846ecbda
dc3bd3d721
d4ce0f3255