Snap for 12596819 from e67b0aa3b0f5eb15b40c4d148c5d070d8a2c6828 to 25Q1-release

Change-Id: I9fa5283815f1c42b61d4a91792a344e9d7a9764c