Merge "Add encryption convenience methods to KeystoreClient."