Snap for 13010426 from abd25312f278da5cbeeca6a9b5fc1c5ea6dabc23 to 25Q2-release Change-Id: If202479ceb3ee7af6b0ce5290a3f049213db1bd9