Merge "Shift to KmVersion::KEYMINT_2"