Snap for 12173239 from 3ef2e1c6dfe55bcd8027423cd1b2963a9142659c to 24Q4-release

Change-Id: I99c2b10e439822839df9e48587dba9b3ebb39838