Merge "Update the default KeyMint version"