[coastguard skipped] Merge sparse cherrypicks from sparse-13150826-L06100030010209915 into 25Q1-release.

COASTGUARD_SKIP: Ie39216559094785893db205c133a76537bce9bf6

Change-Id: Ib0a35bdd075926d1469589ec3914698841aaab64