Snap for 11996894 from df4aa6913a2b11152156232e97e9f609342e91ce to 24Q4-release

Change-Id: I98ccfd3e8927619e9fe56c04b46e03cb89787d67