[coastguard skipped] Merge sparse cherrypicks from sparse-13218059-L43800030010400522 into 25Q1-release.

COASTGUARD_SKIP: Iaa87b5c5ed269e8d2b53fb43a21d782ccfcb06c8

Change-Id: I84e1903b1b51be1461c5b38aa69a080e875d99e9