[coastguard skipped] Merge sparse cherrypicks from sparse-13270399-L13500030010685594 into 25Q1-release.

COASTGUARD_SKIP: If956dbdfcaf41641d8fcc4bd16381004bac8c342

Change-Id: Ie97c5c0910bf8cf58c675529bb69817a915720d5