Snap for 11742632 from 4c248f0417efcee037f4d2e549fe4f979a447530 to 24Q3-release

Change-Id: Icdf73744ef6b4dad1229ade5005ce9571654fddf