am 5c025ac5: (-s ours) am 599fc2c0: (-s ours) am c94fa0b0: (-s ours) DO NOT MERGE Revert "Erase PST partition if its marked to be erased."

* commit '5c025ac5c84c19e4eac6ca6e9f5c2f51e09add54':
  DO NOT MERGE Revert "Erase PST partition if its marked to be erased."