Snap for 11510485 from c66788d5a7fe6e86adba07f628d615f7669d404a to 24Q2-release

Change-Id: I886d5c382869bdf3287281bd166d1e1c28ca08f9