[coastguard skipped] Merge sparse cherrypicks from sparse-12723046-L97500030008075518 into 25Q1-release.

COASTGUARD_SKIP: I362ba99872c2fbdae3ce6c9183dca89d6e99c314
COASTGUARD_SKIP: I69e5f8879119f17ffa6740e3d67c437fe7fa938e

Change-Id: I32770b7fc7fa9a868c17adcc2d38a9b177b71915