Snap for 12704382 from d355c6b4e704c1f4cbd1d549d3e232d21fd9a701 to 25Q1-release

Change-Id: I11836ed308faf2076fe13d296c521974a547129b