[coastguard skipped] Merge sparse cherrypicks from sparse-13775243-L92100030014435199 into 24Q3-platform-release.

COASTGUARD_SKIP: I2c73f1b5b884a8b1157ccc333c4be446d12547e7
COASTGUARD_SKIP: I7510c167e3f063ac48840bc9ccab66ab26d046ce

Change-Id: I3fd4168ab0d7195fb0dcb0600cb5dca65f7e21ab