[coastguard skipped] Merge sparse cherrypicks from sparse-13240079-L44400030010507797 into 25Q1-release.

COASTGUARD_SKIP: Ib02fd0b3dfd354e53ff7e6d6d352d3e91933b3ea
COASTGUARD_SKIP: I136a624dee3557e3db5348563985a430fd02d23b

Change-Id: I956b6c6d11331cabb7044141b06a7562f7fa3ab4