Merge "Import KvBackupEncrypter"