[coastguard skipped] Merge sparse cherrypicks from sparse-12636973-L99400030007843745 into 24Q4-release.

COASTGUARD_SKIP: Idd8638b9e270c533eacce7da8c297654aa84bfb4

Change-Id: Ibcfbc679cbc20076b1959016fdc713f0d7ef6c10