Merge "Refactor keystorage and arond."