Snap for 12770256 from 15e199e5fe84df4edf5907f9dc1c70e2fa64c0e4 to 25Q1-release

Change-Id: I634447faf913f25237d172c15c05c9db31e9f611