[coastguard skipped] Merge sparse cherrypicks from sparse-12143574-L23000030005476973 into 24D1-release.

COASTGUARD_SKIP: I806654fb5cc7bb882f8e58bddf4c2cb1d31ae87e
COASTGUARD_SKIP: I3d682f99caf0b05593b0f99bf738cd4aeeab22a2
COASTGUARD_SKIP: I5de5e88e286aea0a5d5786e7f84732f947a88449

Change-Id: Ic6e59d84e737f6c3bb2689e2200b789675724f15