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

Change-Id: Id11cb6af6a7e7d9512a3b56efae4832ccfb2f928