Snap for 11504324 from 4d1085e4a2d95c699f9ae607f028fc1bc6f91b87 to 24Q2-release

Change-Id: I0778e6333acf7991f9cd3aaedf3f3c2b3cfae99a