Merge "Create a KeystoreClient class."