Merge "Fix a regression in registering for package_removed" into nyc-dev