Merge "Revert "Add keychain user with special keystore access permissions""