Merge "Fix for manage_keyring behavior."