Snap for 11710546 from 1ca4d88b43a8d2035d33d1ad6f2ba62a448a1bf6 to 24Q3-release

Change-Id: Ic99fe01ca203de3d20266c25f9d31e09663d1766