Snap for 12296955 from 0f2d7d0a7ff7ab991a4ebd79aad5fc812aec8dcd to 24Q4-release

Change-Id: Idc312cf8acc9989ad885b47854b4ef752711ec32