Snap for 11944020 from aba0830e555ed53940ab77a43375dbec23aed770 to 24Q3-release

Change-Id: I2fc4fe1ba94ba1ac5a78db25f1786cd00ad88d95