Merge "Erase PST partition if its marked to be erased." into lmp-dev