[coastguard skipped] Merge sparse cherrypicks from sparse-13272751-L40800030010704228 into 25Q1-release.

COASTGUARD_SKIP: Ib02fd0b3dfd354e53ff7e6d6d352d3e91933b3ea
COASTGUARD_SKIP: I609defbb1df83dc9510ee59dd857fd5e69ce43fb

Change-Id: I9c2a8610114ae98eeed702053ac1cdf7591ecf17