[coastguard skipped] Merge sparse cherrypicks from sparse-13010343-L69700030009374823 into 25Q1-release.

COASTGUARD_SKIP: I00ef69849067a04ffaaf6c1837541a5b35adebdd

Change-Id: I6585af6ed05b416a958550d4cf849853455921c9