Snap for 12265118 from f705dddb80da27a4e193b8bff96ff1bb269af258 to 24Q4-release

Change-Id: Ib1b18e287ad8db154d02bf8a74a9ced5c88769b2