Merge "Use the package class for wipe packages" am: 2a33682ef5
am: 682cd4fbc4

Change-Id: I2f85ee25631805263032e67ec35511b28c06640d