Merge "Add a tool to add keys to keyring."