Snap for 12755599 from 6cba6573f7ff997a14fc05fda064c2855fb3669c to 25Q1-release

Change-Id: I61f5be5bed24a0d343bebea5f473c957dddbc7c6