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

COASTGUARD_SKIP: I014067ef7b430f5da7efe807125ea5d74a17856a
COASTGUARD_SKIP: I1ee7a09b7628a67dcb3502b29d99761bafd913b5

Change-Id: I5d8a6ddb5840b908cb81d0838d806a764eb5d8c6