Merge "move data wipe to end of OTA package"