Snap for 11227258 from 1e6adce763ef3134b832ed7a11007bcb49e549af to 24Q2-release

Change-Id: I15d46d23785e7fc130b2909edc77b80301ee3bdd