Snap for 12623742 from e1d49f1aadcf897085a52bb1b9b524df025fca6d to 25Q1-release

Change-Id: I0a3d416fd02dc0a1aaf666e0e959e4760ed6a113