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

COASTGUARD_SKIP: I91c44428dc730be4cf42b3cb9c02e8eca4440f81
COASTGUARD_SKIP: I6cb652cecf3a3023532bb17eee275bf66fee250d
COASTGUARD_SKIP: Ibe8a80d65c4dff6368352944e004c5c934430953

Change-Id: Ie412064bca0eb653cbc36f45b2ed966488856b38