Snap for 11784291 from 93c3ae24c59b9b9516c1bd2f5b3f93346fc5add0 to 24Q3-release

Change-Id: Ic1d2ca596b61f1800f893c4d6224921ad33e20bf