Snap for 10865348 from 2180815cfb592c940a770321fc77b1f2c1d2aa20 to 24Q1-release Change-Id: I5e3d202410361aff74313520f4cfea232d562a62