Merge "[DO NOT MERGE] Don't accidentally delete renamed packages" into nyc-mr1-dev am: e9db00e39f am: 5ac13dcb25 am: 69a039eb78
am: 3494413b99 -s ours
Change-Id: If807066cabe2fee34fe1e2bcc5d76a4a1106fe3b
This commit is contained in: