diff --git a/config/audio/V2_0/iface_fuzzer/AndroidTest.xml b/config/audio/V2_0/iface_fuzzer/AndroidTest.xml
index 693a1f1..55131af 100644
--- a/config/audio/V2_0/iface_fuzzer/AndroidTest.xml
+++ b/config/audio/V2_0/iface_fuzzer/AndroidTest.xml
@@ -7,7 +7,6 @@
     <target_preparer class="com.android.compatibility.common.tradefed.targetprep.VtsFilePusher">
         <option name="push-group" value="IfaceFuzzerTest.push"/>
     </target_preparer>
-    <multi_target_preparer class="com.android.tradefed.targetprep.VtsPythonVirtualenvPreparer" />
     <test class="com.android.tradefed.testtype.VtsMultiDeviceTest">
         <option name="test-module-name" value="VtsHalAudioV2_0IfaceFuzzer"/>
         <option name="hal-hidl-package-name" value="android.hardware.audio@2.0"/>
diff --git a/config/audio/common/V2_0/iface_fuzzer/AndroidTest.xml b/config/audio/common/V2_0/iface_fuzzer/AndroidTest.xml
index 0cd0ad1..655d2a1 100644
--- a/config/audio/common/V2_0/iface_fuzzer/AndroidTest.xml
+++ b/config/audio/common/V2_0/iface_fuzzer/AndroidTest.xml
@@ -7,7 +7,6 @@
     <target_preparer class="com.android.compatibility.common.tradefed.targetprep.VtsFilePusher">
         <option name="push-group" value="IfaceFuzzerTest.push"/>
     </target_preparer>
-    <multi_target_preparer class="com.android.tradefed.targetprep.VtsPythonVirtualenvPreparer" />
     <test class="com.android.tradefed.testtype.VtsMultiDeviceTest">
         <option name="test-module-name" value="VtsHalAudioCommonV2_0IfaceFuzzer"/>
         <option name="hal-hidl-package-name" value="android.hardware.audio.common@2.0"/>
diff --git a/config/audio/effect/V2_0/iface_fuzzer/AndroidTest.xml b/config/audio/effect/V2_0/iface_fuzzer/AndroidTest.xml
index d0f8707..74982d0 100644
--- a/config/audio/effect/V2_0/iface_fuzzer/AndroidTest.xml
+++ b/config/audio/effect/V2_0/iface_fuzzer/AndroidTest.xml
@@ -7,7 +7,6 @@
     <target_preparer class="com.android.compatibility.common.tradefed.targetprep.VtsFilePusher">
         <option name="push-group" value="IfaceFuzzerTest.push"/>
     </target_preparer>
-    <multi_target_preparer class="com.android.tradefed.targetprep.VtsPythonVirtualenvPreparer" />
     <test class="com.android.tradefed.testtype.VtsMultiDeviceTest">
         <option name="test-module-name" value="VtsHalAudioEffectV2_0IfaceFuzzer"/>
         <option name="hal-hidl-package-name" value="android.hardware.audio.effect@2.0"/>
diff --git a/config/automotive/evs/V1_0/iface_fuzzer/AndroidTest.xml b/config/automotive/evs/V1_0/iface_fuzzer/AndroidTest.xml
index 595acff..ab8dde8 100644
--- a/config/automotive/evs/V1_0/iface_fuzzer/AndroidTest.xml
+++ b/config/automotive/evs/V1_0/iface_fuzzer/AndroidTest.xml
@@ -7,7 +7,6 @@
     <target_preparer class="com.android.compatibility.common.tradefed.targetprep.VtsFilePusher">
         <option name="push-group" value="IfaceFuzzerTest.push"/>
     </target_preparer>
-    <multi_target_preparer class="com.android.tradefed.targetprep.VtsPythonVirtualenvPreparer" />
     <test class="com.android.tradefed.testtype.VtsMultiDeviceTest">
         <option name="test-module-name" value="VtsHalAutomotiveEvsV1_0IfaceFuzzer"/>
         <option name="hal-hidl-package-name" value="android.hardware.automotive.evs@1.0"/>
diff --git a/config/automotive/vehicle/V2_0/iface_fuzzer/AndroidTest.xml b/config/automotive/vehicle/V2_0/iface_fuzzer/AndroidTest.xml
index b88e71c..262575e 100644
--- a/config/automotive/vehicle/V2_0/iface_fuzzer/AndroidTest.xml
+++ b/config/automotive/vehicle/V2_0/iface_fuzzer/AndroidTest.xml
@@ -7,7 +7,6 @@
     <target_preparer class="com.android.compatibility.common.tradefed.targetprep.VtsFilePusher">
         <option name="push-group" value="IfaceFuzzerTest.push"/>
     </target_preparer>
-    <multi_target_preparer class="com.android.tradefed.targetprep.VtsPythonVirtualenvPreparer" />
     <test class="com.android.tradefed.testtype.VtsMultiDeviceTest">
         <option name="test-module-name" value="VtsHalAutomotiveVehicleV2_0IfaceFuzzer"/>
         <option name="hal-hidl-package-name" value="android.hardware.automotive.vehicle@2.0"/>
diff --git a/config/automotive/vehicle/V2_1/iface_fuzzer/AndroidTest.xml b/config/automotive/vehicle/V2_1/iface_fuzzer/AndroidTest.xml
index 2abeb6d..98c1b5f 100644
--- a/config/automotive/vehicle/V2_1/iface_fuzzer/AndroidTest.xml
+++ b/config/automotive/vehicle/V2_1/iface_fuzzer/AndroidTest.xml
@@ -7,7 +7,6 @@
     <target_preparer class="com.android.compatibility.common.tradefed.targetprep.VtsFilePusher">
         <option name="push-group" value="IfaceFuzzerTest.push"/>
     </target_preparer>
-    <multi_target_preparer class="com.android.tradefed.targetprep.VtsPythonVirtualenvPreparer" />
     <test class="com.android.tradefed.testtype.VtsMultiDeviceTest">
         <option name="test-module-name" value="VtsHalAutomotiveVehicleV2_1IfaceFuzzer"/>
         <option name="hal-hidl-package-name" value="android.hardware.automotive.vehicle@2.1"/>
diff --git a/config/biometrics/fingerprint/V2_1/iface_fuzzer/AndroidTest.xml b/config/biometrics/fingerprint/V2_1/iface_fuzzer/AndroidTest.xml
index 696d021..ab3215c 100644
--- a/config/biometrics/fingerprint/V2_1/iface_fuzzer/AndroidTest.xml
+++ b/config/biometrics/fingerprint/V2_1/iface_fuzzer/AndroidTest.xml
@@ -7,7 +7,6 @@
     <target_preparer class="com.android.compatibility.common.tradefed.targetprep.VtsFilePusher">
         <option name="push-group" value="IfaceFuzzerTest.push"/>
     </target_preparer>
-    <multi_target_preparer class="com.android.tradefed.targetprep.VtsPythonVirtualenvPreparer" />
     <test class="com.android.tradefed.testtype.VtsMultiDeviceTest">
         <option name="test-module-name" value="VtsHalBiometricsFingerprintV2_1IfaceFuzzer"/>
         <option name="hal-hidl-package-name" value="android.hardware.biometrics.fingerprint@2.1"/>
diff --git a/config/bluetooth/V1_0/iface_fuzzer/AndroidTest.xml b/config/bluetooth/V1_0/iface_fuzzer/AndroidTest.xml
index 852cabb..21f626c 100644
--- a/config/bluetooth/V1_0/iface_fuzzer/AndroidTest.xml
+++ b/config/bluetooth/V1_0/iface_fuzzer/AndroidTest.xml
@@ -7,7 +7,6 @@
     <target_preparer class="com.android.compatibility.common.tradefed.targetprep.VtsFilePusher">
         <option name="push-group" value="IfaceFuzzerTest.push"/>
     </target_preparer>
-    <multi_target_preparer class="com.android.tradefed.targetprep.VtsPythonVirtualenvPreparer" />
     <test class="com.android.tradefed.testtype.VtsMultiDeviceTest">
         <option name="test-module-name" value="VtsHalBluetoothV1_0IfaceFuzzer"/>
         <option name="hal-hidl-package-name" value="android.hardware.bluetooth@1.0"/>
diff --git a/config/boot/V1_0/iface_fuzzer/AndroidTest.xml b/config/boot/V1_0/iface_fuzzer/AndroidTest.xml
index 93662d1..3eda116 100644
--- a/config/boot/V1_0/iface_fuzzer/AndroidTest.xml
+++ b/config/boot/V1_0/iface_fuzzer/AndroidTest.xml
@@ -7,7 +7,6 @@
     <target_preparer class="com.android.compatibility.common.tradefed.targetprep.VtsFilePusher">
         <option name="push-group" value="IfaceFuzzerTest.push"/>
     </target_preparer>
-    <multi_target_preparer class="com.android.tradefed.targetprep.VtsPythonVirtualenvPreparer" />
     <test class="com.android.tradefed.testtype.VtsMultiDeviceTest">
         <option name="test-module-name" value="VtsHalBootV1_0IfaceFuzzer"/>
         <option name="hal-hidl-package-name" value="android.hardware.boot@1.0"/>
diff --git a/config/broadcastradio/V1_0/iface_fuzzer/AndroidTest.xml b/config/broadcastradio/V1_0/iface_fuzzer/AndroidTest.xml
index 4470c4b..9b913ee 100644
--- a/config/broadcastradio/V1_0/iface_fuzzer/AndroidTest.xml
+++ b/config/broadcastradio/V1_0/iface_fuzzer/AndroidTest.xml
@@ -7,7 +7,6 @@
     <target_preparer class="com.android.compatibility.common.tradefed.targetprep.VtsFilePusher">
         <option name="push-group" value="IfaceFuzzerTest.push"/>
     </target_preparer>
-    <multi_target_preparer class="com.android.tradefed.targetprep.VtsPythonVirtualenvPreparer" />
     <test class="com.android.tradefed.testtype.VtsMultiDeviceTest">
         <option name="test-module-name" value="VtsHalBroadcastradioV1_0IfaceFuzzer"/>
         <option name="hal-hidl-package-name" value="android.hardware.broadcastradio@1.0"/>
diff --git a/config/broadcastradio/V1_1/iface_fuzzer/AndroidTest.xml b/config/broadcastradio/V1_1/iface_fuzzer/AndroidTest.xml
index bdd3632..d84ab51 100644
--- a/config/broadcastradio/V1_1/iface_fuzzer/AndroidTest.xml
+++ b/config/broadcastradio/V1_1/iface_fuzzer/AndroidTest.xml
@@ -7,7 +7,6 @@
     <target_preparer class="com.android.compatibility.common.tradefed.targetprep.VtsFilePusher">
         <option name="push-group" value="IfaceFuzzerTest.push"/>
     </target_preparer>
-    <multi_target_preparer class="com.android.tradefed.targetprep.VtsPythonVirtualenvPreparer" />
     <test class="com.android.tradefed.testtype.VtsMultiDeviceTest">
         <option name="test-module-name" value="VtsHalBroadcastradioV1_1IfaceFuzzer"/>
         <option name="hal-hidl-package-name" value="android.hardware.broadcastradio@1.1"/>
diff --git a/config/camera/common/V1_0/iface_fuzzer/AndroidTest.xml b/config/camera/common/V1_0/iface_fuzzer/AndroidTest.xml
index 48ca1b8..d6fdbae 100644
--- a/config/camera/common/V1_0/iface_fuzzer/AndroidTest.xml
+++ b/config/camera/common/V1_0/iface_fuzzer/AndroidTest.xml
@@ -7,7 +7,6 @@
     <target_preparer class="com.android.compatibility.common.tradefed.targetprep.VtsFilePusher">
         <option name="push-group" value="IfaceFuzzerTest.push"/>
     </target_preparer>
-    <multi_target_preparer class="com.android.tradefed.targetprep.VtsPythonVirtualenvPreparer" />
     <test class="com.android.tradefed.testtype.VtsMultiDeviceTest">
         <option name="test-module-name" value="VtsHalCameraCommonV1_0IfaceFuzzer"/>
         <option name="hal-hidl-package-name" value="android.hardware.camera.common@1.0"/>
diff --git a/config/camera/device/V1_0/iface_fuzzer/AndroidTest.xml b/config/camera/device/V1_0/iface_fuzzer/AndroidTest.xml
index 1ed02d2..ce15443 100644
--- a/config/camera/device/V1_0/iface_fuzzer/AndroidTest.xml
+++ b/config/camera/device/V1_0/iface_fuzzer/AndroidTest.xml
@@ -7,7 +7,6 @@
     <target_preparer class="com.android.compatibility.common.tradefed.targetprep.VtsFilePusher">
         <option name="push-group" value="IfaceFuzzerTest.push"/>
     </target_preparer>
-    <multi_target_preparer class="com.android.tradefed.targetprep.VtsPythonVirtualenvPreparer" />
     <test class="com.android.tradefed.testtype.VtsMultiDeviceTest">
         <option name="test-module-name" value="VtsHalCameraDeviceV1_0IfaceFuzzer"/>
         <option name="hal-hidl-package-name" value="android.hardware.camera.device@1.0"/>
diff --git a/config/camera/device/V3_2/iface_fuzzer/AndroidTest.xml b/config/camera/device/V3_2/iface_fuzzer/AndroidTest.xml
index a5d7657..a4533d2 100644
--- a/config/camera/device/V3_2/iface_fuzzer/AndroidTest.xml
+++ b/config/camera/device/V3_2/iface_fuzzer/AndroidTest.xml
@@ -7,7 +7,6 @@
     <target_preparer class="com.android.compatibility.common.tradefed.targetprep.VtsFilePusher">
         <option name="push-group" value="IfaceFuzzerTest.push"/>
     </target_preparer>
-    <multi_target_preparer class="com.android.tradefed.targetprep.VtsPythonVirtualenvPreparer" />
     <test class="com.android.tradefed.testtype.VtsMultiDeviceTest">
         <option name="test-module-name" value="VtsHalCameraDeviceV3_2IfaceFuzzer"/>
         <option name="hal-hidl-package-name" value="android.hardware.camera.device@3.2"/>
diff --git a/config/camera/metadata/V3_2/iface_fuzzer/AndroidTest.xml b/config/camera/metadata/V3_2/iface_fuzzer/AndroidTest.xml
index 19ba17e..03f32d7 100644
--- a/config/camera/metadata/V3_2/iface_fuzzer/AndroidTest.xml
+++ b/config/camera/metadata/V3_2/iface_fuzzer/AndroidTest.xml
@@ -7,7 +7,6 @@
     <target_preparer class="com.android.compatibility.common.tradefed.targetprep.VtsFilePusher">
         <option name="push-group" value="IfaceFuzzerTest.push"/>
     </target_preparer>
-    <multi_target_preparer class="com.android.tradefed.targetprep.VtsPythonVirtualenvPreparer" />
     <test class="com.android.tradefed.testtype.VtsMultiDeviceTest">
         <option name="test-module-name" value="VtsHalCameraMetadataV3_2IfaceFuzzer"/>
         <option name="hal-hidl-package-name" value="android.hardware.camera.metadata@3.2"/>
diff --git a/config/camera/provider/V2_4/iface_fuzzer/AndroidTest.xml b/config/camera/provider/V2_4/iface_fuzzer/AndroidTest.xml
index 9da4b50..b066061 100644
--- a/config/camera/provider/V2_4/iface_fuzzer/AndroidTest.xml
+++ b/config/camera/provider/V2_4/iface_fuzzer/AndroidTest.xml
@@ -7,7 +7,6 @@
     <target_preparer class="com.android.compatibility.common.tradefed.targetprep.VtsFilePusher">
         <option name="push-group" value="IfaceFuzzerTest.push"/>
     </target_preparer>
-    <multi_target_preparer class="com.android.tradefed.targetprep.VtsPythonVirtualenvPreparer" />
     <test class="com.android.tradefed.testtype.VtsMultiDeviceTest">
         <option name="test-module-name" value="VtsHalCameraProviderV2_4IfaceFuzzer"/>
         <option name="hal-hidl-package-name" value="android.hardware.camera.provider@2.4"/>
diff --git a/config/configstore/V1_0/iface_fuzzer/AndroidTest.xml b/config/configstore/V1_0/iface_fuzzer/AndroidTest.xml
index c7c8b28..5070bd5 100644
--- a/config/configstore/V1_0/iface_fuzzer/AndroidTest.xml
+++ b/config/configstore/V1_0/iface_fuzzer/AndroidTest.xml
@@ -7,7 +7,6 @@
     <target_preparer class="com.android.compatibility.common.tradefed.targetprep.VtsFilePusher">
         <option name="push-group" value="IfaceFuzzerTest.push"/>
     </target_preparer>
-    <multi_target_preparer class="com.android.tradefed.targetprep.VtsPythonVirtualenvPreparer" />
     <test class="com.android.tradefed.testtype.VtsMultiDeviceTest">
         <option name="test-module-name" value="VtsHalConfigstoreV1_0IfaceFuzzer"/>
         <option name="hal-hidl-package-name" value="android.hardware.configstore@1.0"/>
diff --git a/config/contexthub/V1_0/iface_fuzzer/AndroidTest.xml b/config/contexthub/V1_0/iface_fuzzer/AndroidTest.xml
index 436490a..6e75f9a 100644
--- a/config/contexthub/V1_0/iface_fuzzer/AndroidTest.xml
+++ b/config/contexthub/V1_0/iface_fuzzer/AndroidTest.xml
@@ -7,7 +7,6 @@
     <target_preparer class="com.android.compatibility.common.tradefed.targetprep.VtsFilePusher">
         <option name="push-group" value="IfaceFuzzerTest.push"/>
     </target_preparer>
-    <multi_target_preparer class="com.android.tradefed.targetprep.VtsPythonVirtualenvPreparer" />
     <test class="com.android.tradefed.testtype.VtsMultiDeviceTest">
         <option name="test-module-name" value="VtsHalContexthubV1_0IfaceFuzzer"/>
         <option name="hal-hidl-package-name" value="android.hardware.contexthub@1.0"/>
diff --git a/config/drm/V1_0/iface_fuzzer/AndroidTest.xml b/config/drm/V1_0/iface_fuzzer/AndroidTest.xml
index 9fa8e07..bad0f40 100644
--- a/config/drm/V1_0/iface_fuzzer/AndroidTest.xml
+++ b/config/drm/V1_0/iface_fuzzer/AndroidTest.xml
@@ -7,7 +7,6 @@
     <target_preparer class="com.android.compatibility.common.tradefed.targetprep.VtsFilePusher">
         <option name="push-group" value="IfaceFuzzerTest.push"/>
     </target_preparer>
-    <multi_target_preparer class="com.android.tradefed.targetprep.VtsPythonVirtualenvPreparer" />
     <test class="com.android.tradefed.testtype.VtsMultiDeviceTest">
         <option name="test-module-name" value="VtsHalDrmV1_0IfaceFuzzer"/>
         <option name="hal-hidl-package-name" value="android.hardware.drm@1.0"/>
diff --git a/config/dumpstate/V1_0/iface_fuzzer/AndroidTest.xml b/config/dumpstate/V1_0/iface_fuzzer/AndroidTest.xml
index d2e268b..f709641 100644
--- a/config/dumpstate/V1_0/iface_fuzzer/AndroidTest.xml
+++ b/config/dumpstate/V1_0/iface_fuzzer/AndroidTest.xml
@@ -7,7 +7,6 @@
     <target_preparer class="com.android.compatibility.common.tradefed.targetprep.VtsFilePusher">
         <option name="push-group" value="IfaceFuzzerTest.push"/>
     </target_preparer>
-    <multi_target_preparer class="com.android.tradefed.targetprep.VtsPythonVirtualenvPreparer" />
     <test class="com.android.tradefed.testtype.VtsMultiDeviceTest">
         <option name="test-module-name" value="VtsHalDumpstateV1_0IfaceFuzzer"/>
         <option name="hal-hidl-package-name" value="android.hardware.dumpstate@1.0"/>
diff --git a/config/gatekeeper/V1_0/iface_fuzzer/AndroidTest.xml b/config/gatekeeper/V1_0/iface_fuzzer/AndroidTest.xml
index 1e565fb..52981ae 100644
--- a/config/gatekeeper/V1_0/iface_fuzzer/AndroidTest.xml
+++ b/config/gatekeeper/V1_0/iface_fuzzer/AndroidTest.xml
@@ -7,7 +7,6 @@
     <target_preparer class="com.android.compatibility.common.tradefed.targetprep.VtsFilePusher">
         <option name="push-group" value="IfaceFuzzerTest.push"/>
     </target_preparer>
-    <multi_target_preparer class="com.android.tradefed.targetprep.VtsPythonVirtualenvPreparer" />
     <test class="com.android.tradefed.testtype.VtsMultiDeviceTest">
         <option name="test-module-name" value="VtsHalGatekeeperV1_0IfaceFuzzer"/>
         <option name="hal-hidl-package-name" value="android.hardware.gatekeeper@1.0"/>
diff --git a/config/gnss/V1_0/iface_fuzzer/AndroidTest.xml b/config/gnss/V1_0/iface_fuzzer/AndroidTest.xml
index f65094a..ce57486 100644
--- a/config/gnss/V1_0/iface_fuzzer/AndroidTest.xml
+++ b/config/gnss/V1_0/iface_fuzzer/AndroidTest.xml
@@ -7,7 +7,6 @@
     <target_preparer class="com.android.compatibility.common.tradefed.targetprep.VtsFilePusher">
         <option name="push-group" value="IfaceFuzzerTest.push"/>
     </target_preparer>
-    <multi_target_preparer class="com.android.tradefed.targetprep.VtsPythonVirtualenvPreparer" />
     <test class="com.android.tradefed.testtype.VtsMultiDeviceTest">
         <option name="test-module-name" value="VtsHalGnssV1_0IfaceFuzzer"/>
         <option name="hal-hidl-package-name" value="android.hardware.gnss@1.0"/>
diff --git a/config/graphics/allocator/V2_0/iface_fuzzer/AndroidTest.xml b/config/graphics/allocator/V2_0/iface_fuzzer/AndroidTest.xml
index d2f7e5d..e2a0221 100644
--- a/config/graphics/allocator/V2_0/iface_fuzzer/AndroidTest.xml
+++ b/config/graphics/allocator/V2_0/iface_fuzzer/AndroidTest.xml
@@ -7,7 +7,6 @@
     <target_preparer class="com.android.compatibility.common.tradefed.targetprep.VtsFilePusher">
         <option name="push-group" value="IfaceFuzzerTest.push"/>
     </target_preparer>
-    <multi_target_preparer class="com.android.tradefed.targetprep.VtsPythonVirtualenvPreparer" />
     <test class="com.android.tradefed.testtype.VtsMultiDeviceTest">
         <option name="test-module-name" value="VtsHalGraphicsAllocatorV2_0IfaceFuzzer"/>
         <option name="hal-hidl-package-name" value="android.hardware.graphics.allocator@2.0"/>
diff --git a/config/graphics/bufferqueue/V1_0/iface_fuzzer/AndroidTest.xml b/config/graphics/bufferqueue/V1_0/iface_fuzzer/AndroidTest.xml
index 3892223..2a15f05 100644
--- a/config/graphics/bufferqueue/V1_0/iface_fuzzer/AndroidTest.xml
+++ b/config/graphics/bufferqueue/V1_0/iface_fuzzer/AndroidTest.xml
@@ -7,7 +7,6 @@
     <target_preparer class="com.android.compatibility.common.tradefed.targetprep.VtsFilePusher">
         <option name="push-group" value="IfaceFuzzerTest.push"/>
     </target_preparer>
-    <multi_target_preparer class="com.android.tradefed.targetprep.VtsPythonVirtualenvPreparer" />
     <test class="com.android.tradefed.testtype.VtsMultiDeviceTest">
         <option name="test-module-name" value="VtsHalGraphicsBufferqueueV1_0IfaceFuzzer"/>
         <option name="hal-hidl-package-name" value="android.hardware.graphics.bufferqueue@1.0"/>
diff --git a/config/graphics/common/V1_0/iface_fuzzer/AndroidTest.xml b/config/graphics/common/V1_0/iface_fuzzer/AndroidTest.xml
index 6449d6c..15cf5d1 100644
--- a/config/graphics/common/V1_0/iface_fuzzer/AndroidTest.xml
+++ b/config/graphics/common/V1_0/iface_fuzzer/AndroidTest.xml
@@ -7,7 +7,6 @@
     <target_preparer class="com.android.compatibility.common.tradefed.targetprep.VtsFilePusher">
         <option name="push-group" value="IfaceFuzzerTest.push"/>
     </target_preparer>
-    <multi_target_preparer class="com.android.tradefed.targetprep.VtsPythonVirtualenvPreparer" />
     <test class="com.android.tradefed.testtype.VtsMultiDeviceTest">
         <option name="test-module-name" value="VtsHalGraphicsCommonV1_0IfaceFuzzer"/>
         <option name="hal-hidl-package-name" value="android.hardware.graphics.common@1.0"/>
diff --git a/config/graphics/composer/V2_1/iface_fuzzer/AndroidTest.xml b/config/graphics/composer/V2_1/iface_fuzzer/AndroidTest.xml
index 678c171..4aa2926 100644
--- a/config/graphics/composer/V2_1/iface_fuzzer/AndroidTest.xml
+++ b/config/graphics/composer/V2_1/iface_fuzzer/AndroidTest.xml
@@ -7,7 +7,6 @@
     <target_preparer class="com.android.compatibility.common.tradefed.targetprep.VtsFilePusher">
         <option name="push-group" value="IfaceFuzzerTest.push"/>
     </target_preparer>
-    <multi_target_preparer class="com.android.tradefed.targetprep.VtsPythonVirtualenvPreparer" />
     <test class="com.android.tradefed.testtype.VtsMultiDeviceTest">
         <option name="test-module-name" value="VtsHalGraphicsComposerV2_1IfaceFuzzer"/>
         <option name="hal-hidl-package-name" value="android.hardware.graphics.composer@2.1"/>
diff --git a/config/graphics/mapper/V2_0/iface_fuzzer/AndroidTest.xml b/config/graphics/mapper/V2_0/iface_fuzzer/AndroidTest.xml
index fa443db..27a3533 100644
--- a/config/graphics/mapper/V2_0/iface_fuzzer/AndroidTest.xml
+++ b/config/graphics/mapper/V2_0/iface_fuzzer/AndroidTest.xml
@@ -7,7 +7,6 @@
     <target_preparer class="com.android.compatibility.common.tradefed.targetprep.VtsFilePusher">
         <option name="push-group" value="IfaceFuzzerTest.push"/>
     </target_preparer>
-    <multi_target_preparer class="com.android.tradefed.targetprep.VtsPythonVirtualenvPreparer" />
     <test class="com.android.tradefed.testtype.VtsMultiDeviceTest">
         <option name="test-module-name" value="VtsHalGraphicsMapperV2_0IfaceFuzzer"/>
         <option name="hal-hidl-package-name" value="android.hardware.graphics.mapper@2.0"/>
diff --git a/config/health/V1_0/iface_fuzzer/AndroidTest.xml b/config/health/V1_0/iface_fuzzer/AndroidTest.xml
index 0cef0fd..98daddf 100644
--- a/config/health/V1_0/iface_fuzzer/AndroidTest.xml
+++ b/config/health/V1_0/iface_fuzzer/AndroidTest.xml
@@ -7,7 +7,6 @@
     <target_preparer class="com.android.compatibility.common.tradefed.targetprep.VtsFilePusher">
         <option name="push-group" value="IfaceFuzzerTest.push"/>
     </target_preparer>
-    <multi_target_preparer class="com.android.tradefed.targetprep.VtsPythonVirtualenvPreparer" />
     <test class="com.android.tradefed.testtype.VtsMultiDeviceTest">
         <option name="test-module-name" value="VtsHalHealthV1_0IfaceFuzzer"/>
         <option name="hal-hidl-package-name" value="android.hardware.health@1.0"/>
diff --git a/config/ir/V1_0/iface_fuzzer/AndroidTest.xml b/config/ir/V1_0/iface_fuzzer/AndroidTest.xml
index 7596c05..9599b21 100644
--- a/config/ir/V1_0/iface_fuzzer/AndroidTest.xml
+++ b/config/ir/V1_0/iface_fuzzer/AndroidTest.xml
@@ -7,7 +7,6 @@
     <target_preparer class="com.android.compatibility.common.tradefed.targetprep.VtsFilePusher">
         <option name="push-group" value="IfaceFuzzerTest.push"/>
     </target_preparer>
-    <multi_target_preparer class="com.android.tradefed.targetprep.VtsPythonVirtualenvPreparer" />
     <test class="com.android.tradefed.testtype.VtsMultiDeviceTest">
         <option name="test-module-name" value="VtsHalIrV1_0IfaceFuzzer"/>
         <option name="hal-hidl-package-name" value="android.hardware.ir@1.0"/>
diff --git a/config/keymaster/V3_0/iface_fuzzer/AndroidTest.xml b/config/keymaster/V3_0/iface_fuzzer/AndroidTest.xml
index 80f681b..2484e9e 100644
--- a/config/keymaster/V3_0/iface_fuzzer/AndroidTest.xml
+++ b/config/keymaster/V3_0/iface_fuzzer/AndroidTest.xml
@@ -7,7 +7,6 @@
     <target_preparer class="com.android.compatibility.common.tradefed.targetprep.VtsFilePusher">
         <option name="push-group" value="IfaceFuzzerTest.push"/>
     </target_preparer>
-    <multi_target_preparer class="com.android.tradefed.targetprep.VtsPythonVirtualenvPreparer" />
     <test class="com.android.tradefed.testtype.VtsMultiDeviceTest">
         <option name="test-module-name" value="VtsHalKeymasterV3_0IfaceFuzzer"/>
         <option name="hal-hidl-package-name" value="android.hardware.keymaster@3.0"/>
diff --git a/config/light/V2_0/iface_fuzzer/AndroidTest.xml b/config/light/V2_0/iface_fuzzer/AndroidTest.xml
index d25c9f8..21d1fcc 100644
--- a/config/light/V2_0/iface_fuzzer/AndroidTest.xml
+++ b/config/light/V2_0/iface_fuzzer/AndroidTest.xml
@@ -7,7 +7,6 @@
     <target_preparer class="com.android.compatibility.common.tradefed.targetprep.VtsFilePusher">
         <option name="push-group" value="IfaceFuzzerTest.push"/>
     </target_preparer>
-    <multi_target_preparer class="com.android.tradefed.targetprep.VtsPythonVirtualenvPreparer" />
     <test class="com.android.tradefed.testtype.VtsMultiDeviceTest">
         <option name="test-module-name" value="VtsHalLightV2_0IfaceFuzzer"/>
         <option name="hal-hidl-package-name" value="android.hardware.light@2.0"/>
diff --git a/config/media/V1_0/iface_fuzzer/AndroidTest.xml b/config/media/V1_0/iface_fuzzer/AndroidTest.xml
index 4f045f6..2ccacd1 100644
--- a/config/media/V1_0/iface_fuzzer/AndroidTest.xml
+++ b/config/media/V1_0/iface_fuzzer/AndroidTest.xml
@@ -7,7 +7,6 @@
     <target_preparer class="com.android.compatibility.common.tradefed.targetprep.VtsFilePusher">
         <option name="push-group" value="IfaceFuzzerTest.push"/>
     </target_preparer>
-    <multi_target_preparer class="com.android.tradefed.targetprep.VtsPythonVirtualenvPreparer" />
     <test class="com.android.tradefed.testtype.VtsMultiDeviceTest">
         <option name="test-module-name" value="VtsHalMediaV1_0IfaceFuzzer"/>
         <option name="hal-hidl-package-name" value="android.hardware.media@1.0"/>
diff --git a/config/media/omx/V1_0/iface_fuzzer/AndroidTest.xml b/config/media/omx/V1_0/iface_fuzzer/AndroidTest.xml
index 3b9df4c..f13befc 100644
--- a/config/media/omx/V1_0/iface_fuzzer/AndroidTest.xml
+++ b/config/media/omx/V1_0/iface_fuzzer/AndroidTest.xml
@@ -7,7 +7,6 @@
     <target_preparer class="com.android.compatibility.common.tradefed.targetprep.VtsFilePusher">
         <option name="push-group" value="IfaceFuzzerTest.push"/>
     </target_preparer>
-    <multi_target_preparer class="com.android.tradefed.targetprep.VtsPythonVirtualenvPreparer" />
     <test class="com.android.tradefed.testtype.VtsMultiDeviceTest">
         <option name="test-module-name" value="VtsHalMediaOmxV1_0IfaceFuzzer"/>
         <option name="hal-hidl-package-name" value="android.hardware.media.omx@1.0"/>
diff --git a/config/memtrack/V1_0/iface_fuzzer/AndroidTest.xml b/config/memtrack/V1_0/iface_fuzzer/AndroidTest.xml
index 2c4b6cf..3423d0f 100644
--- a/config/memtrack/V1_0/iface_fuzzer/AndroidTest.xml
+++ b/config/memtrack/V1_0/iface_fuzzer/AndroidTest.xml
@@ -7,7 +7,6 @@
     <target_preparer class="com.android.compatibility.common.tradefed.targetprep.VtsFilePusher">
         <option name="push-group" value="IfaceFuzzerTest.push"/>
     </target_preparer>
-    <multi_target_preparer class="com.android.tradefed.targetprep.VtsPythonVirtualenvPreparer" />
     <test class="com.android.tradefed.testtype.VtsMultiDeviceTest">
         <option name="test-module-name" value="VtsHalMemtrackV1_0IfaceFuzzer"/>
         <option name="hal-hidl-package-name" value="android.hardware.memtrack@1.0"/>
diff --git a/config/nfc/V1_0/iface_fuzzer/AndroidTest.xml b/config/nfc/V1_0/iface_fuzzer/AndroidTest.xml
index 3ac90bc..9f51098 100644
--- a/config/nfc/V1_0/iface_fuzzer/AndroidTest.xml
+++ b/config/nfc/V1_0/iface_fuzzer/AndroidTest.xml
@@ -7,7 +7,6 @@
     <target_preparer class="com.android.compatibility.common.tradefed.targetprep.VtsFilePusher">
         <option name="push-group" value="IfaceFuzzerTest.push"/>
     </target_preparer>
-    <multi_target_preparer class="com.android.tradefed.targetprep.VtsPythonVirtualenvPreparer" />
     <test class="com.android.tradefed.testtype.VtsMultiDeviceTest">
         <option name="test-module-name" value="VtsHalNfcV1_0IfaceFuzzer"/>
         <option name="hal-hidl-package-name" value="android.hardware.nfc@1.0"/>
diff --git a/config/power/V1_0/iface_fuzzer/AndroidTest.xml b/config/power/V1_0/iface_fuzzer/AndroidTest.xml
index 525eb14..088ea7c 100644
--- a/config/power/V1_0/iface_fuzzer/AndroidTest.xml
+++ b/config/power/V1_0/iface_fuzzer/AndroidTest.xml
@@ -7,7 +7,6 @@
     <target_preparer class="com.android.compatibility.common.tradefed.targetprep.VtsFilePusher">
         <option name="push-group" value="IfaceFuzzerTest.push"/>
     </target_preparer>
-    <multi_target_preparer class="com.android.tradefed.targetprep.VtsPythonVirtualenvPreparer" />
     <test class="com.android.tradefed.testtype.VtsMultiDeviceTest">
         <option name="test-module-name" value="VtsHalPowerV1_0IfaceFuzzer"/>
         <option name="hal-hidl-package-name" value="android.hardware.power@1.0"/>
diff --git a/config/radio/V1_0/iface_fuzzer/AndroidTest.xml b/config/radio/V1_0/iface_fuzzer/AndroidTest.xml
index 68a0ca9..ac012b7 100644
--- a/config/radio/V1_0/iface_fuzzer/AndroidTest.xml
+++ b/config/radio/V1_0/iface_fuzzer/AndroidTest.xml
@@ -7,7 +7,6 @@
     <target_preparer class="com.android.compatibility.common.tradefed.targetprep.VtsFilePusher">
         <option name="push-group" value="IfaceFuzzerTest.push"/>
     </target_preparer>
-    <multi_target_preparer class="com.android.tradefed.targetprep.VtsPythonVirtualenvPreparer" />
     <test class="com.android.tradefed.testtype.VtsMultiDeviceTest">
         <option name="test-module-name" value="VtsHalRadioV1_0IfaceFuzzer"/>
         <option name="hal-hidl-package-name" value="android.hardware.radio@1.0"/>
diff --git a/config/radio/V1_1/iface_fuzzer/AndroidTest.xml b/config/radio/V1_1/iface_fuzzer/AndroidTest.xml
index 6a93904..c00e785 100644
--- a/config/radio/V1_1/iface_fuzzer/AndroidTest.xml
+++ b/config/radio/V1_1/iface_fuzzer/AndroidTest.xml
@@ -7,7 +7,6 @@
     <target_preparer class="com.android.compatibility.common.tradefed.targetprep.VtsFilePusher">
         <option name="push-group" value="IfaceFuzzerTest.push"/>
     </target_preparer>
-    <multi_target_preparer class="com.android.tradefed.targetprep.VtsPythonVirtualenvPreparer" />
     <test class="com.android.tradefed.testtype.VtsMultiDeviceTest">
         <option name="test-module-name" value="VtsHalRadioV1_1IfaceFuzzer"/>
         <option name="hal-hidl-package-name" value="android.hardware.radio@1.1"/>
diff --git a/config/radio/deprecated/V1_0/iface_fuzzer/AndroidTest.xml b/config/radio/deprecated/V1_0/iface_fuzzer/AndroidTest.xml
index f4e1f40..5388b37 100644
--- a/config/radio/deprecated/V1_0/iface_fuzzer/AndroidTest.xml
+++ b/config/radio/deprecated/V1_0/iface_fuzzer/AndroidTest.xml
@@ -7,7 +7,6 @@
     <target_preparer class="com.android.compatibility.common.tradefed.targetprep.VtsFilePusher">
         <option name="push-group" value="IfaceFuzzerTest.push"/>
     </target_preparer>
-    <multi_target_preparer class="com.android.tradefed.targetprep.VtsPythonVirtualenvPreparer" />
     <test class="com.android.tradefed.testtype.VtsMultiDeviceTest">
         <option name="test-module-name" value="VtsHalRadioDeprecatedV1_0IfaceFuzzer"/>
         <option name="hal-hidl-package-name" value="android.hardware.radio.deprecated@1.0"/>
diff --git a/config/renderscript/V1_0/iface_fuzzer/AndroidTest.xml b/config/renderscript/V1_0/iface_fuzzer/AndroidTest.xml
index 6a6508d..839ad30 100644
--- a/config/renderscript/V1_0/iface_fuzzer/AndroidTest.xml
+++ b/config/renderscript/V1_0/iface_fuzzer/AndroidTest.xml
@@ -7,7 +7,6 @@
     <target_preparer class="com.android.compatibility.common.tradefed.targetprep.VtsFilePusher">
         <option name="push-group" value="IfaceFuzzerTest.push"/>
     </target_preparer>
-    <multi_target_preparer class="com.android.tradefed.targetprep.VtsPythonVirtualenvPreparer" />
     <test class="com.android.tradefed.testtype.VtsMultiDeviceTest">
         <option name="test-module-name" value="VtsHalRenderscriptV1_0IfaceFuzzer"/>
         <option name="hal-hidl-package-name" value="android.hardware.renderscript@1.0"/>
diff --git a/config/sensors/V1_0/iface_fuzzer/AndroidTest.xml b/config/sensors/V1_0/iface_fuzzer/AndroidTest.xml
index c27324e..856c3f1 100644
--- a/config/sensors/V1_0/iface_fuzzer/AndroidTest.xml
+++ b/config/sensors/V1_0/iface_fuzzer/AndroidTest.xml
@@ -7,7 +7,6 @@
     <target_preparer class="com.android.compatibility.common.tradefed.targetprep.VtsFilePusher">
         <option name="push-group" value="IfaceFuzzerTest.push"/>
     </target_preparer>
-    <multi_target_preparer class="com.android.tradefed.targetprep.VtsPythonVirtualenvPreparer" />
     <test class="com.android.tradefed.testtype.VtsMultiDeviceTest">
         <option name="test-module-name" value="VtsHalSensorsV1_0IfaceFuzzer"/>
         <option name="hal-hidl-package-name" value="android.hardware.sensors@1.0"/>
diff --git a/config/soundtrigger/V2_0/iface_fuzzer/AndroidTest.xml b/config/soundtrigger/V2_0/iface_fuzzer/AndroidTest.xml
index 8f22b3d..7b7df89 100644
--- a/config/soundtrigger/V2_0/iface_fuzzer/AndroidTest.xml
+++ b/config/soundtrigger/V2_0/iface_fuzzer/AndroidTest.xml
@@ -7,7 +7,6 @@
     <target_preparer class="com.android.compatibility.common.tradefed.targetprep.VtsFilePusher">
         <option name="push-group" value="IfaceFuzzerTest.push"/>
     </target_preparer>
-    <multi_target_preparer class="com.android.tradefed.targetprep.VtsPythonVirtualenvPreparer" />
     <test class="com.android.tradefed.testtype.VtsMultiDeviceTest">
         <option name="test-module-name" value="VtsHalSoundtriggerV2_0IfaceFuzzer"/>
         <option name="hal-hidl-package-name" value="android.hardware.soundtrigger@2.0"/>
diff --git a/config/tetheroffload/config/V1_0/iface_fuzzer/AndroidTest.xml b/config/tetheroffload/config/V1_0/iface_fuzzer/AndroidTest.xml
index 8c00756..325ebdd 100644
--- a/config/tetheroffload/config/V1_0/iface_fuzzer/AndroidTest.xml
+++ b/config/tetheroffload/config/V1_0/iface_fuzzer/AndroidTest.xml
@@ -7,7 +7,6 @@
     <target_preparer class="com.android.compatibility.common.tradefed.targetprep.VtsFilePusher">
         <option name="push-group" value="IfaceFuzzerTest.push"/>
     </target_preparer>
-    <multi_target_preparer class="com.android.tradefed.targetprep.VtsPythonVirtualenvPreparer" />
     <test class="com.android.tradefed.testtype.VtsMultiDeviceTest">
         <option name="test-module-name" value="VtsHalTetheroffloadConfigV1_0IfaceFuzzer"/>
         <option name="hal-hidl-package-name" value="android.hardware.tetheroffload.config@1.0"/>
diff --git a/config/tetheroffload/control/V1_0/iface_fuzzer/AndroidTest.xml b/config/tetheroffload/control/V1_0/iface_fuzzer/AndroidTest.xml
index 89b282b..0e8c2b8 100644
--- a/config/tetheroffload/control/V1_0/iface_fuzzer/AndroidTest.xml
+++ b/config/tetheroffload/control/V1_0/iface_fuzzer/AndroidTest.xml
@@ -7,7 +7,6 @@
     <target_preparer class="com.android.compatibility.common.tradefed.targetprep.VtsFilePusher">
         <option name="push-group" value="IfaceFuzzerTest.push"/>
     </target_preparer>
-    <multi_target_preparer class="com.android.tradefed.targetprep.VtsPythonVirtualenvPreparer" />
     <test class="com.android.tradefed.testtype.VtsMultiDeviceTest">
         <option name="test-module-name" value="VtsHalTetheroffloadControlV1_0IfaceFuzzer"/>
         <option name="hal-hidl-package-name" value="android.hardware.tetheroffload.control@1.0"/>
diff --git a/config/thermal/V1_0/iface_fuzzer/AndroidTest.xml b/config/thermal/V1_0/iface_fuzzer/AndroidTest.xml
index 7fca3f4..8476ad5 100644
--- a/config/thermal/V1_0/iface_fuzzer/AndroidTest.xml
+++ b/config/thermal/V1_0/iface_fuzzer/AndroidTest.xml
@@ -7,7 +7,6 @@
     <target_preparer class="com.android.compatibility.common.tradefed.targetprep.VtsFilePusher">
         <option name="push-group" value="IfaceFuzzerTest.push"/>
     </target_preparer>
-    <multi_target_preparer class="com.android.tradefed.targetprep.VtsPythonVirtualenvPreparer" />
     <test class="com.android.tradefed.testtype.VtsMultiDeviceTest">
         <option name="test-module-name" value="VtsHalThermalV1_0IfaceFuzzer"/>
         <option name="hal-hidl-package-name" value="android.hardware.thermal@1.0"/>
diff --git a/config/tv/cec/V1_0/iface_fuzzer/AndroidTest.xml b/config/tv/cec/V1_0/iface_fuzzer/AndroidTest.xml
index 8f0d925..bd57c1d 100644
--- a/config/tv/cec/V1_0/iface_fuzzer/AndroidTest.xml
+++ b/config/tv/cec/V1_0/iface_fuzzer/AndroidTest.xml
@@ -7,7 +7,6 @@
     <target_preparer class="com.android.compatibility.common.tradefed.targetprep.VtsFilePusher">
         <option name="push-group" value="IfaceFuzzerTest.push"/>
     </target_preparer>
-    <multi_target_preparer class="com.android.tradefed.targetprep.VtsPythonVirtualenvPreparer" />
     <test class="com.android.tradefed.testtype.VtsMultiDeviceTest">
         <option name="test-module-name" value="VtsHalTvCecV1_0IfaceFuzzer"/>
         <option name="hal-hidl-package-name" value="android.hardware.tv.cec@1.0"/>
diff --git a/config/tv/input/V1_0/iface_fuzzer/AndroidTest.xml b/config/tv/input/V1_0/iface_fuzzer/AndroidTest.xml
index e224f64..dfe4618 100644
--- a/config/tv/input/V1_0/iface_fuzzer/AndroidTest.xml
+++ b/config/tv/input/V1_0/iface_fuzzer/AndroidTest.xml
@@ -7,7 +7,6 @@
     <target_preparer class="com.android.compatibility.common.tradefed.targetprep.VtsFilePusher">
         <option name="push-group" value="IfaceFuzzerTest.push"/>
     </target_preparer>
-    <multi_target_preparer class="com.android.tradefed.targetprep.VtsPythonVirtualenvPreparer" />
     <test class="com.android.tradefed.testtype.VtsMultiDeviceTest">
         <option name="test-module-name" value="VtsHalTvInputV1_0IfaceFuzzer"/>
         <option name="hal-hidl-package-name" value="android.hardware.tv.input@1.0"/>
diff --git a/config/usb/V1_0/iface_fuzzer/AndroidTest.xml b/config/usb/V1_0/iface_fuzzer/AndroidTest.xml
index 9eb4086..24badf4 100644
--- a/config/usb/V1_0/iface_fuzzer/AndroidTest.xml
+++ b/config/usb/V1_0/iface_fuzzer/AndroidTest.xml
@@ -7,7 +7,6 @@
     <target_preparer class="com.android.compatibility.common.tradefed.targetprep.VtsFilePusher">
         <option name="push-group" value="IfaceFuzzerTest.push"/>
     </target_preparer>
-    <multi_target_preparer class="com.android.tradefed.targetprep.VtsPythonVirtualenvPreparer" />
     <test class="com.android.tradefed.testtype.VtsMultiDeviceTest">
         <option name="test-module-name" value="VtsHalUsbV1_0IfaceFuzzer"/>
         <option name="hal-hidl-package-name" value="android.hardware.usb@1.0"/>
diff --git a/config/vibrator/V1_0/iface_fuzzer/AndroidTest.xml b/config/vibrator/V1_0/iface_fuzzer/AndroidTest.xml
index 4893a90..470742c 100644
--- a/config/vibrator/V1_0/iface_fuzzer/AndroidTest.xml
+++ b/config/vibrator/V1_0/iface_fuzzer/AndroidTest.xml
@@ -7,7 +7,6 @@
     <target_preparer class="com.android.compatibility.common.tradefed.targetprep.VtsFilePusher">
         <option name="push-group" value="IfaceFuzzerTest.push"/>
     </target_preparer>
-    <multi_target_preparer class="com.android.tradefed.targetprep.VtsPythonVirtualenvPreparer" />
     <test class="com.android.tradefed.testtype.VtsMultiDeviceTest">
         <option name="test-module-name" value="VtsHalVibratorV1_0IfaceFuzzer"/>
         <option name="hal-hidl-package-name" value="android.hardware.vibrator@1.0"/>
diff --git a/config/vr/V1_0/iface_fuzzer/AndroidTest.xml b/config/vr/V1_0/iface_fuzzer/AndroidTest.xml
index 932409e..9b3e649 100644
--- a/config/vr/V1_0/iface_fuzzer/AndroidTest.xml
+++ b/config/vr/V1_0/iface_fuzzer/AndroidTest.xml
@@ -7,7 +7,6 @@
     <target_preparer class="com.android.compatibility.common.tradefed.targetprep.VtsFilePusher">
         <option name="push-group" value="IfaceFuzzerTest.push"/>
     </target_preparer>
-    <multi_target_preparer class="com.android.tradefed.targetprep.VtsPythonVirtualenvPreparer" />
     <test class="com.android.tradefed.testtype.VtsMultiDeviceTest">
         <option name="test-module-name" value="VtsHalVrV1_0IfaceFuzzer"/>
         <option name="hal-hidl-package-name" value="android.hardware.vr@1.0"/>
diff --git a/config/wifi/V1_0/iface_fuzzer/AndroidTest.xml b/config/wifi/V1_0/iface_fuzzer/AndroidTest.xml
index b8b957a..ba2efc8 100644
--- a/config/wifi/V1_0/iface_fuzzer/AndroidTest.xml
+++ b/config/wifi/V1_0/iface_fuzzer/AndroidTest.xml
@@ -7,7 +7,6 @@
     <target_preparer class="com.android.compatibility.common.tradefed.targetprep.VtsFilePusher">
         <option name="push-group" value="IfaceFuzzerTest.push"/>
     </target_preparer>
-    <multi_target_preparer class="com.android.tradefed.targetprep.VtsPythonVirtualenvPreparer" />
     <test class="com.android.tradefed.testtype.VtsMultiDeviceTest">
         <option name="test-module-name" value="VtsHalWifiV1_0IfaceFuzzer"/>
         <option name="hal-hidl-package-name" value="android.hardware.wifi@1.0"/>
diff --git a/config/wifi/supplicant/V1_0/iface_fuzzer/AndroidTest.xml b/config/wifi/supplicant/V1_0/iface_fuzzer/AndroidTest.xml
index 8c72760..1a05b63 100644
--- a/config/wifi/supplicant/V1_0/iface_fuzzer/AndroidTest.xml
+++ b/config/wifi/supplicant/V1_0/iface_fuzzer/AndroidTest.xml
@@ -7,7 +7,6 @@
     <target_preparer class="com.android.compatibility.common.tradefed.targetprep.VtsFilePusher">
         <option name="push-group" value="IfaceFuzzerTest.push"/>
     </target_preparer>
-    <multi_target_preparer class="com.android.tradefed.targetprep.VtsPythonVirtualenvPreparer" />
     <test class="com.android.tradefed.testtype.VtsMultiDeviceTest">
         <option name="test-module-name" value="VtsHalWifiSupplicantV1_0IfaceFuzzer"/>
         <option name="hal-hidl-package-name" value="android.hardware.wifi.supplicant@1.0"/>