[coastguard skipped] Merge sparse cherrypicks from sparse-12545800-L12100030007483540 into 24Q4-release.
COASTGUARD_SKIP: I1e8fa883134a7c015790e0f55300f94ebcac3241 Change-Id: I7c55c88b3620628d32d72cc4bcfa718a7d32a8b2
This commit is contained in:
COASTGUARD_SKIP: I1e8fa883134a7c015790e0f55300f94ebcac3241 Change-Id: I7c55c88b3620628d32d72cc4bcfa718a7d32a8b2