Merge "Fix a no-op uninstall being treated as a failure"