Snap for 12573674 from f7c835933105ef379f041d07f8f03afcffa6d6d3 to 25Q1-release

Change-Id: I754986fe5afd6d9d918b3389b840c03ebc0907da