Merge "Remove dependency on keyring"