Snap for 7213075 from 1d0e2206c0c8f0131bb8e41293a1ef91d60a0a9a to rvc-qpr3-releaseandroid-11.0.0_r46android-11.0.0_r43android-11.0.0_r40android-11.0.0_r39android-11.0.0_r38android11-qpr3-s1-releaseandroid11-qpr3-release

Change-Id: I47ff55d1a17c56fd322d001389a4c6e62131225a

1 files changed, 1 insertions, 2 deletions

diff --git a/device_build_interfaces/com/android/tradefed/device/TestDeviceOptions.java b/device_build_interfaces/com/android/tradefed/device/TestDeviceOptions.java
index e3d7de148..f0ba7b32d 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 @@ public class TestDeviceOptions {
             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";
         }