Snap for 12337407 from 89f47c01bd8c4f6c86e8f9e65af8e43ffcfd2a93 to 25Q1-release

Change-Id: I49d806627b0e3f3a26b6ab6f12c0d102d219f1be