Snap for 11348195 from 1c0be20d051990899bf0f22f3b7a1145790cf073 to 24Q2-release Change-Id: Ie31237e0ad525f5bd40c261aa9a1ed5b265b093b