Snap for 12658558 from c097850023b09943d0473151a7951d4c36e1461d to 25Q1-release

Change-Id: I5dd5e46a427ce0b28dd3a74b93c6792506cea4b0