[coastguard skipped] Merge sparse cherrypicks from sparse-12545800-L12600030008266990 into 24Q4-release.

COASTGUARD_SKIP: I94456a1c7387ed2c75bfb3ab3c6698738d22f598
COASTGUARD_SKIP: I2db7e2cc2371b1cc79270f2369f6f9b0b6af4a93

Change-Id: Ie197e23d2e5eb2ce3d12a365a6459146f5b6742d