Snap for 13219462 from e0a19bd4bfc8386dfcaa7a41422ab098cb6b0d74 to 25Q2-release

Change-Id: I92ce45a92aaa85c1be30640f1370fe542960b282