Snap for 12687986 from 5f31b0632d239b2c46e5cdede6584f300b6a7f1f to 25Q1-release

Change-Id: I9da09d4318304def305b4ceedfdf561bc2a6b86c