Merge "Add version and impl info field to EncryptedKey"