am 9295980a: Merge "Revert "Erase PST partition if its marked to be erased.""

* commit '9295980ac1554ff7c30531298aadec0750b027e0':
  Revert "Erase PST partition if its marked to be erased."