Merge "[DO NOT MERGE] Don't accidentally delete renamed packages" into nyc-mr1-dev am: e9db00e39f
am: 5ac13dcb25

Change-Id: Ic2950d36ac4f7a32d45e06741e80963f7e1cf583