Snap for 12702769 from 87aaa50b403753b41bfb84e98a41109f8a19d642 to 25Q1-release

Change-Id: Ia1b94807084d3b0a3ccb63ffb613fc11bebeb5fb