Merge "Refactor keystore." am: e4f2fa54b0
am: 63e1e79476  -s ours

* commit '63e1e794768d2960f95b569ad587847d7e14b8ba':
  Refactor keystore.