am e21ff08e: am a1009c34: Merge "Split WipeData into PreWipeData and PostWipeData."

* commit 'e21ff08ea6a94bcd751a3cb0e6123275e0f18a2b':
  Split WipeData into PreWipeData and PostWipeData.