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

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