Snap for 12687986 from e97c57cfc32429acfd67b2b9b6f62bb8ac5bac8d to 25Q1-release

Change-Id: I76b0df369b8f1791e1ada702ec15821c35f94fa0