Snap for 12742097 from fccda2049fea206b84fadef6e5694c83fd787a84 to 25Q1-release

Change-Id: I38236d305f16ea3f9f7b790798427db58ec0f367