1 files changed, 1 insertions, 2 deletions
diff --git a/src/com/android/tradefed/targetprep/DeviceCleaner.java b/src/com/android/tradefed/targetprep/DeviceCleaner.java
index e2d1c184d..60024f26a 100644
--- a/src/com/android/tradefed/targetprep/DeviceCleaner.java
+++ b/src/com/android/tradefed/targetprep/DeviceCleaner.java
@@ -104,8 +104,7 @@ public class DeviceCleaner implements ITargetCleaner {
                     break;
                 case FORMAT:
                     device.rebootIntoBootloader();
-                    device.executeLongFastbootCommand("format", "cache");
-                    device.executeLongFastbootCommand("format", "userdata");
+                    device.executeLongFastbootCommand("-w");
                     device.executeFastbootCommand("reboot");
                     device.waitForDeviceAvailable();
                     break;