[coastguard skipped] Merge sparse cherrypicks from sparse-13009785-L02100030009347264 into 25Q1-release.

COASTGUARD_SKIP: I9e6b0f39017765f0cd6aa295932aa40962a92f9e
COASTGUARD_SKIP: I737c47c7df87e11608672a4e16eb3e9fd645e487

Change-Id: I16b0a420a8e22f17b3770e36fac0a6d07340eaed