[coastguard skipped] Merge sparse cherrypicks from sparse-13083703-L97000030009736637 into 25Q1-release.

COASTGUARD_SKIP: I782ff694b9298d1aae9dee41be85aaf788a8aa75
COASTGUARD_SKIP: I6d7294b535041783b420b818ef1771b15ea75722

Change-Id: Ib814dced49047defd37ab7ef4a3a5485179e47c8