[coastguard skipped] Merge sparse cherrypicks from sparse-13096125-L52500030009750946 into 25Q1-release.

COASTGUARD_SKIP: I4b4b690e89edb4daee1b96b4100889be240de978

Change-Id: Id16ec8b00e83b5b7723907dc5ac2438c921763d5