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

COASTGUARD_SKIP: If85901bd95b098487ba8917e5b98f16797f581e5

Change-Id: I48157fa9bda25b96f03df201e52fb57ceb00c054