Snap for 12048319 from 913e51f866f4c611e5f2e78c89b647fb96b5edcd to 24Q4-release

Change-Id: I3b4a693b17c4a94982e3af90230b4a3842113ff8