Snap for 12496712 from 07ea09d6e6695b9eaa4278bdfa6a17b98eec9978 to 25Q1-release

Change-Id: I686277bf6fedfa8ece8d5f0cf02d340b762e12ce