Snap for 11504324 from d014c72b76e6600635162a4f7abe49447449c75c to 24Q2-release

Change-Id: Ie863108401b1352770b8450788e2fbed43433e17