[coastguard skipped] Merge sparse cherrypicks from sparse-12301355-L56800030006212796 into 24Q4-release.

COASTGUARD_SKIP: Ida93a4b8a01533c208f72a7127cca50bad534ef7
COASTGUARD_SKIP: I413a7406ce57799059e791a51e9b09a0a6eeafb6

Change-Id: I2346846cea972882d6553a7258ef421659789594