[coastguard skipped] Merge sparse cherrypicks from sparse-11973172-L70100030004560035 into 24Q2-release.
COASTGUARD_SKIP: I49aa743e982c8139b8ef3ddcc02b75d249665cfc COASTGUARD_SKIP: I2bdfbbed0dff3c3c093dd46200f2d8ce15c28652 COASTGUARD_SKIP: I2f0f9681455968cdaed4a74d3a77c0b2de1ba14b Change-Id: I6809e84352f9013ace6d6f0f468a3b8c2da16a70
This commit is contained in: