Merge "Refactor keystore."
am: e4f2fa54b0

* commit 'e4f2fa54b009838f72219735d692d84d062a0177':
  Refactor keystore.