Snap for 7316203 from 61b37105fbecbdbd4e1eb64fb45d333edce3e85a to rvc-platform-release

Change-Id: Ieb281707bfa533a3826e9fe64b49d873b3ef2805
diff --git a/device_build_interfaces/com/android/tradefed/device/TestDeviceOptions.java b/device_build_interfaces/com/android/tradefed/device/TestDeviceOptions.java
index e3d7de1..f0ba7b3 100644
--- a/device_build_interfaces/com/android/tradefed/device/TestDeviceOptions.java
+++ b/device_build_interfaces/com/android/tradefed/device/TestDeviceOptions.java
@@ -666,10 +666,9 @@
             case CHEEPS:
             case GCE:
             case REMOTE_AVD:
-                return "create";
             case CUTTLEFISH:
             case REMOTE_NESTED_AVD:
-                return "create_cf";
+                return "create";
             case EMULATOR:
                 return "create_gf";
         }