[coastguard skipped] Merge sparse cherrypicks from sparse-11555370-L22300030002426335 into 24D1-release.

COASTGUARD_SKIP: I32258500ec02c2a8cbfc6d0b37aaea2c83c7c8b4
COASTGUARD_SKIP: Ie3fff8163866f5782a5eab5ae3968b790e273a94

Change-Id: Ib49d2a2e7b8b6fc949ccbdc2f81e2f451f580262