Merge "Create a KeystoreClient class."
am: 4122b99ba0

* commit '4122b99ba0cdaeb8bf4a348275de94055fc5df10':
  Create a KeystoreClient class.