Snap for 11869550 from 22d28dfd229eaaaa1d10a7c40f6ab9bfdf6b853c to 24Q3-release

Change-Id: I3d8c06e0589b5de7fa7112df420f2ee1d53b8cc1