Snap for 12580585 from 5ec7a4ee1376a469e6af3938eb30f9651f2fec65 to 25Q1-release

Change-Id: Ie1fe60f528f4efda58ac06220a9fd55d9845a73d