Snap for 11347584 from 1c0be20d051990899bf0f22f3b7a1145790cf073 to 24D1-release Change-Id: I470af57d880b2884c9c979f5ace6f51b6d5ffc2f