Snap for 12658558 from c1ed054e17addaf60440def4e5fedce5619ea621 to 25Q1-release

Change-Id: I127997d22cd3dcbabcbf6822fbc02f84a485d99e