Snap for 12755599 from 069138041ae7cce198ff522909e8db419afb7bb5 to 25Q1-release

Change-Id: Iea4871c65d33bfa89bf56e85fb9fa2b93d6041b8