Snap for 11949167 from 864a14af3125e2f035be59140fe7f7caaea03df5 to 24Q3-release

Change-Id: I9f4bedc866e8a12e3db8b162e20b2605ec8fb1d5