Snap for 12406339 from 57cf8b65c7cd505fafe29022843e3718835a49b3 to 24Q4-release

Change-Id: Id89ef38f732b2640bb82c9d7c6ac2f10e36bd07d