Snap for 11399958 from f32d599772acb29195cf0b915464bb15c4d02647 to 24Q2-release

Change-Id: I251668c7f8571414d87d6b5360b1934c21dd373e