Snap for 12623742 from e80f759bafbef2e3511fadfbb00ae266173888da to 25Q1-release

Change-Id: I4a0f90b5dbf10773ad857b866be1afc77b55a029