Snap for 11784291 from 20b87a24a5beee3f553475afbda0ec9d597d9996 to 24Q3-release

Change-Id: I55820c72f76d5da7db67eaaf5fb96efb420b581c