Snap for 11650815 from 3ddc27c3179ca702b643909839a7d8f275e3a33e to 24Q3-release

Change-Id: I959bbae2db22e566509734d0ce4049886ccaa6fb