Merge "Upgrade KeyMint version"