[coastguard skipped] Merge sparse cherrypicks from sparse-13018634-L50400030009417638 into 25Q2-release.

COASTGUARD_SKIP: I590cb5b30f5bb2cc0b4b35e5bb332eccc1ff5a4a
COASTGUARD_SKIP: If5970a9c0ab5e132a584092cb404ed32671e5d50
COASTGUARD_SKIP: I630b5c327dfefc9ee5cc3fedf765c87ce073e679

Change-Id: I4eba8212a147480b4b8618d92bb1b3e6b8053239