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

Change-Id: I4141899231b1d48bb8217fe071a4146202e10ab8