Snap for 11944020 from 09e476bf6b15285e83d213549e9472399c2b9ce7 to 24Q3-release

Change-Id: Ieb76a97b42f5d99a9da193d68ef95e81c9ba62df