Merge "Revert "Erase PST partition if its marked to be erased.""