[coastguard skipped] Merge sparse cherrypicks from sparse-12393341-L79100030006854453 into 24Q3-platform-release.

COASTGUARD_SKIP: If9858f254d9046b79887fea4e4fb2dea4fa4fc3d
COASTGUARD_SKIP: I91e9966c012fe292cebc0b544f77032613516fac

Change-Id: Iebfa61d4ec4653cbe94a9f2b62ced62aae2e244c