Snap for 12397640 from f0452c676c4b4ef5330589b719c62316b8875108 to 24Q4-release

Change-Id: I2de97d449ec2396f132b783be3a4ec5fcdfc6af9