Snap for 12763142 from c60d7c021d46e3fa8668308dadb5adad86e565a6 to 25Q1-release

Change-Id: Ibd2b3a36eb433406670e75bbb311a5dcd34e9ec0