Snap for 11944020 from f23332660d163438d73b612bdf1b48f98b786539 to 24Q3-release

Change-Id: I6e96f4458ef9eb2d19c6d33d48280f27c10f5a4f