Snap for 11908474 from 980c426a70a474f18e49dc707d3f9c178165bb59 to 24Q3-release

Change-Id: I075bbd83c90c418321bf5f3542d9d96c5e1b87de