Snap for 11486370 from 50c493cd31c30a14ea4d89dbd5c8f40061c3b2a0 to 24Q2-release

Change-Id: I6d68e7196546dd1870801d1ba677c0af2c2d183d