Snap for 12296955 from 13589dbd08d65d6d02bbc9f34982263a886fa101 to 24Q4-release

Change-Id: If7d202cec23392b762f87edf26d4b8fb73f582a7