Merge "[DO NOT MERGE] Don't accidentally delete renamed packages" into nyc-mr1-dev