Snap for 11717025 from 7485b22521f577cf944e5687361548d8993d8d2c to 24Q3-release

Change-Id: Ic1932bc25d8bd93e1ca921b32aa4e9ace56b12a0