am 1b33ff33: Merge "move data wipe to end of OTA package"
am 1b33ff33: Merge "move data wipe to end of OTA package"

* commit '1b33ff339b4b830ca2fcf9bb18067106342d8e6c':
  move data wipe to end of OTA package

xorware/android_build,xorware/android_build,xorware/android_build,xorware/android_build,xorware/android_build