Snap for 12702769 from 61a401172058c7366e2d47b633db1cd7808f7371 to 25Q1-release

Change-Id: Ifc53aa007e084ab48cf42a6d60391d1ef7826fc2