Snap for 12098010 from 45d122b332cfd9cd18bee3165a6e90fd435df5ec to 24Q4-release

Change-Id: Ic8cb677911c10a4cad58bc1468f78ebdb7c11a7c