Fix a bug where the Deletion Helper could not delete packages. am: 26af56d28e
am: 70939124c2

Change-Id: I7600f1c4916d682e6240c00e18a266326eb90bf6