[coastguard skipped] Merge sparse cherrypicks from sparse-14342233-L30500030033931745 into 24Q3-platform-release.

COASTGUARD_SKIP: I5f88f501f4630bb273042218d87c5236517c6e1b
COASTGUARD_SKIP: I9f651c7f1c5674df5774f5a7609f6d3749b5c50c

Change-Id: I55329b2b15ce635b4276cbf30c90553921e35131