Snap for 11828632 from 6b4738b3a37277234b752b4aa622df7e6905a0f3 to 24Q3-release

Change-Id: Iffedaa4e6d1e883cf741d6e16f677d246d20a0ea