Snap for 12397640 from f31148d6ec2c6bf4147fce978606d31e28169c3d to 24Q4-release

Change-Id: Id293cffc8857f30a56a5f6905779d3ffe6416207