Snap for 12710726 from ff9824062130cf8704c4c4ef910e5ebded84b653 to 25Q1-release

Change-Id: I74bebc70db9ad2e34a6c300417e39b67bb5555bc