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

COASTGUARD_SKIP: Iaf59e34577bed2eba8da30037a77d15e4f4bd690
COASTGUARD_SKIP: I3407ec6962285da6cf19434ab89fcf897f3d1555
COASTGUARD_SKIP: I18ab82279e67ad0b7b8de509b23e1b7607b1dbbe

Change-Id: I3e8c8d6370bf84da09ab4bf091a822c27f618f38