Snap for 12742097 from 54f806e41c44b0d2cfa00ad7a03d328d1a2c7236 to 25Q1-release

Change-Id: Ic07eea57deda33c8864afdc7edd16640701958f1