Merge "Fix a bug where the Deletion Helper could not delete packages." into...
Merge "Fix a bug where the Deletion Helper could not delete packages." into nyc-mr1-dev am: e64b7a06 am: 92254c07
am: 315847b4
Change-Id: Iead1e285dcc328b997efbaf94188b9a4514a719c