Snap for 11996894 from e1c627343f9ad2ac357220889e5c0208c5fe5d01 to 24Q4-release

Change-Id: Idd02abc2030cf3d0b8d7298d0fb9274acb3f30f5