Merge "Avoid NPE when deleting package during boot." into nyc-dev