Merge "Revert "Add keychain user""