[coastguard skipped] Merge sparse cherrypicks from sparse-11945331-L10500030004449972 into 24Q3-release.

COASTGUARD_SKIP: I54ef70ec90aad4d127aaf8a289887bad6fd4e87d
COASTGUARD_SKIP: Ib66d1c6942a9c26f18e6e3945382770249165a15

Change-Id: Ife084de99d8718ae299de492289ba5be0179857e