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

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