Snap for 11869550 from c96d92ebcd4e8bfec30dab2927ba689d2a18f527 to 24Q3-release

Change-Id: I2604c7de8ec56d6ef33adf72b4ec018d4c91eadd