Merge "Refactor keystore."