Snap for 11944020 from eae2b9c480a19862e92e65e2d853dbbc02de191b to 24Q3-release

Change-Id: I9d0ce49b27d8f996570c6775d58cd94915d6e64e