Snap for 11510485 from 208ea8016c476e53e72131d8b840b3af21fac1e3 to 24Q2-release

Change-Id: I3f4eac0bf3fdf3c9d5ca3d17340b5abbd9d45d60