[DO NOT MERGE] Don't accidentally delete renamed packages
am: e2c85890ac

Change-Id: Icbd85ddfc76e50553414bd47860370cdc442b796