Snap for 12296955 from 99bf8018391fa3944f6658bc2967ab535fecd363 to 24Q4-release

Change-Id: I406a0978190b913b8c19df5abc4a16cc37fcefa7