[coastguard skipped] Merge sparse cherrypicks from sparse-11363197-L23500030001623370 into 24Q1-release.

COASTGUARD_SKIP: I566c4fa98e4d1bd8701086c2b5e34802ee0a89fb
COASTGUARD_SKIP: I9ce259a2c96e9f8dd8c7598204c35922b56f7a0a
COASTGUARD_SKIP: Ic73043d66fc7f32256afb3a5d1904284c537b724

Change-Id: Ie14f7dce80a4f6a602216cb32aa6f0239d83404f