Merge "Add a new entry in wipe package to list all wipe partitions" am: a8969842ae
am: de5ba7ab97

Change-Id: Ifa7953e465954fc733688d4288a740022362be2a