Merge "Fix a bug where the Deletion Helper could not delete packages." into nyc-mr1-dev
am: e64b7a0656

Change-Id: I40a5f30f84f7e139479aad4920a206936385f625