Snap for 10985023 from 3a22c0a33dd99bcca39a024d43e6fbcc55c2806e to 24Q1-release

Change-Id: Ib2da23a4442dbb2ce89607518df11bc5049bd962