[coastguard skipped] Merge sparse cherrypicks from sparse-13023662-L95400030009450945 into 25Q1-release.

COASTGUARD_SKIP: I5681a36bf28d70ce37e583b088511c9ebd8955b4

Change-Id: I0f16c43ef14a82a740e14c54d5377d58e8d28f88