[coastguard skipped] Merge sparse cherrypicks from sparse-13096125-L75400030010013175 into 25Q1-release.

COASTGUARD_SKIP: Iaf59e34577bed2eba8da30037a77d15e4f4bd690
COASTGUARD_SKIP: Iac4b6305d541a074be4f4d9cc1ecaa1f27103982
COASTGUARD_SKIP: I18ab82279e67ad0b7b8de509b23e1b7607b1dbbe

Change-Id: Id3f29b9d6da29d103bfa9f6979b24351fb59e978