diff --git a/config/audio/V2_0/func_fuzzer/AndroidTest.xml b/config/audio/V2_0/func_fuzzer/AndroidTest.xml
index 502968e..8d879a8 100644
--- a/config/audio/V2_0/func_fuzzer/AndroidTest.xml
+++ b/config/audio/V2_0/func_fuzzer/AndroidTest.xml
@@ -3,6 +3,7 @@
      Do not edit manually.
 -->
 <configuration description="Config for VtsHalAudioV2_0FuncFuzzer test cases">
+    <option name="config-descriptor:metadata" key="plan" value="vts-misc" />
     <target_preparer class="com.android.compatibility.common.tradefed.targetprep.VtsFilePusher">
         <option name="push-group" value="FuncFuzzerTest.push"/>
     </target_preparer>
diff --git a/config/audio/V2_0/iface_fuzzer/AndroidTest.xml b/config/audio/V2_0/iface_fuzzer/AndroidTest.xml
index a4a4c2b..e209388 100644
--- a/config/audio/V2_0/iface_fuzzer/AndroidTest.xml
+++ b/config/audio/V2_0/iface_fuzzer/AndroidTest.xml
@@ -3,6 +3,7 @@
      Do not edit manually.
 -->
 <configuration description="Config for VtsHalAudioV2_0IfaceFuzzer test cases">
+    <option name="config-descriptor:metadata" key="plan" value="vts-fuzz" />
     <target_preparer class="com.android.compatibility.common.tradefed.targetprep.VtsFilePusher">
         <option name="push-group" value="IfaceFuzzerTest.push"/>
     </target_preparer>
diff --git a/config/audio/common/V2_0/func_fuzzer/AndroidTest.xml b/config/audio/common/V2_0/func_fuzzer/AndroidTest.xml
index 13bbdad..9eb6e42 100644
--- a/config/audio/common/V2_0/func_fuzzer/AndroidTest.xml
+++ b/config/audio/common/V2_0/func_fuzzer/AndroidTest.xml
@@ -3,6 +3,7 @@
      Do not edit manually.
 -->
 <configuration description="Config for VtsHalAudioCommonV2_0FuncFuzzer test cases">
+    <option name="config-descriptor:metadata" key="plan" value="vts-misc" />
     <target_preparer class="com.android.compatibility.common.tradefed.targetprep.VtsFilePusher">
         <option name="push-group" value="FuncFuzzerTest.push"/>
     </target_preparer>
diff --git a/config/audio/common/V2_0/iface_fuzzer/AndroidTest.xml b/config/audio/common/V2_0/iface_fuzzer/AndroidTest.xml
index f817873..4c63671 100644
--- a/config/audio/common/V2_0/iface_fuzzer/AndroidTest.xml
+++ b/config/audio/common/V2_0/iface_fuzzer/AndroidTest.xml
@@ -3,6 +3,7 @@
      Do not edit manually.
 -->
 <configuration description="Config for VtsHalAudioCommonV2_0IfaceFuzzer test cases">
+    <option name="config-descriptor:metadata" key="plan" value="vts-misc" />
     <target_preparer class="com.android.compatibility.common.tradefed.targetprep.VtsFilePusher">
         <option name="push-group" value="IfaceFuzzerTest.push"/>
     </target_preparer>
diff --git a/config/audio/effect/V2_0/func_fuzzer/AndroidTest.xml b/config/audio/effect/V2_0/func_fuzzer/AndroidTest.xml
index e9e9f83..eea5602 100644
--- a/config/audio/effect/V2_0/func_fuzzer/AndroidTest.xml
+++ b/config/audio/effect/V2_0/func_fuzzer/AndroidTest.xml
@@ -3,6 +3,7 @@
      Do not edit manually.
 -->
 <configuration description="Config for VtsHalAudioEffectV2_0FuncFuzzer test cases">
+    <option name="config-descriptor:metadata" key="plan" value="vts-misc" />
     <target_preparer class="com.android.compatibility.common.tradefed.targetprep.VtsFilePusher">
         <option name="push-group" value="FuncFuzzerTest.push"/>
     </target_preparer>
diff --git a/config/audio/effect/V2_0/iface_fuzzer/AndroidTest.xml b/config/audio/effect/V2_0/iface_fuzzer/AndroidTest.xml
index 0fab484..f81ca38 100644
--- a/config/audio/effect/V2_0/iface_fuzzer/AndroidTest.xml
+++ b/config/audio/effect/V2_0/iface_fuzzer/AndroidTest.xml
@@ -3,6 +3,7 @@
      Do not edit manually.
 -->
 <configuration description="Config for VtsHalAudioEffectV2_0IfaceFuzzer test cases">
+    <option name="config-descriptor:metadata" key="plan" value="vts-fuzz" />
     <target_preparer class="com.android.compatibility.common.tradefed.targetprep.VtsFilePusher">
         <option name="push-group" value="IfaceFuzzerTest.push"/>
     </target_preparer>
diff --git a/config/automotive/evs/V1_0/func_fuzzer/AndroidTest.xml b/config/automotive/evs/V1_0/func_fuzzer/AndroidTest.xml
index 3ea65ff..4a3bf00 100644
--- a/config/automotive/evs/V1_0/func_fuzzer/AndroidTest.xml
+++ b/config/automotive/evs/V1_0/func_fuzzer/AndroidTest.xml
@@ -3,6 +3,7 @@
      Do not edit manually.
 -->
 <configuration description="Config for VtsHalAutomotiveEvsV1_0FuncFuzzer test cases">
+    <option name="config-descriptor:metadata" key="plan" value="vts-misc" />
     <target_preparer class="com.android.compatibility.common.tradefed.targetprep.VtsFilePusher">
         <option name="push-group" value="FuncFuzzerTest.push"/>
     </target_preparer>
diff --git a/config/automotive/evs/V1_0/iface_fuzzer/AndroidTest.xml b/config/automotive/evs/V1_0/iface_fuzzer/AndroidTest.xml
index f8bbd26..f678ea4 100644
--- a/config/automotive/evs/V1_0/iface_fuzzer/AndroidTest.xml
+++ b/config/automotive/evs/V1_0/iface_fuzzer/AndroidTest.xml
@@ -3,6 +3,7 @@
      Do not edit manually.
 -->
 <configuration description="Config for VtsHalAutomotiveEvsV1_0IfaceFuzzer test cases">
+    <option name="config-descriptor:metadata" key="plan" value="vts-misc" />
     <target_preparer class="com.android.compatibility.common.tradefed.targetprep.VtsFilePusher">
         <option name="push-group" value="IfaceFuzzerTest.push"/>
     </target_preparer>
diff --git a/config/automotive/vehicle/V2_0/func_fuzzer/AndroidTest.xml b/config/automotive/vehicle/V2_0/func_fuzzer/AndroidTest.xml
index 25dfe0e..35dd8a5 100644
--- a/config/automotive/vehicle/V2_0/func_fuzzer/AndroidTest.xml
+++ b/config/automotive/vehicle/V2_0/func_fuzzer/AndroidTest.xml
@@ -3,6 +3,7 @@
      Do not edit manually.
 -->
 <configuration description="Config for VtsHalAutomotiveVehicleV2_0FuncFuzzer test cases">
+    <option name="config-descriptor:metadata" key="plan" value="vts-misc" />
     <target_preparer class="com.android.compatibility.common.tradefed.targetprep.VtsFilePusher">
         <option name="push-group" value="FuncFuzzerTest.push"/>
     </target_preparer>
diff --git a/config/automotive/vehicle/V2_0/iface_fuzzer/AndroidTest.xml b/config/automotive/vehicle/V2_0/iface_fuzzer/AndroidTest.xml
index 2345c67..df4221f 100644
--- a/config/automotive/vehicle/V2_0/iface_fuzzer/AndroidTest.xml
+++ b/config/automotive/vehicle/V2_0/iface_fuzzer/AndroidTest.xml
@@ -3,6 +3,7 @@
      Do not edit manually.
 -->
 <configuration description="Config for VtsHalAutomotiveVehicleV2_0IfaceFuzzer test cases">
+    <option name="config-descriptor:metadata" key="plan" value="vts-misc" />
     <target_preparer class="com.android.compatibility.common.tradefed.targetprep.VtsFilePusher">
         <option name="push-group" value="IfaceFuzzerTest.push"/>
     </target_preparer>
diff --git a/config/automotive/vehicle/V2_1/func_fuzzer/AndroidTest.xml b/config/automotive/vehicle/V2_1/func_fuzzer/AndroidTest.xml
index 8f8deb2..9626e27 100644
--- a/config/automotive/vehicle/V2_1/func_fuzzer/AndroidTest.xml
+++ b/config/automotive/vehicle/V2_1/func_fuzzer/AndroidTest.xml
@@ -3,6 +3,7 @@
      Do not edit manually.
 -->
 <configuration description="Config for VtsHalAutomotiveVehicleV2_1FuncFuzzer test cases">
+    <option name="config-descriptor:metadata" key="plan" value="vts-misc" />
     <target_preparer class="com.android.compatibility.common.tradefed.targetprep.VtsFilePusher">
         <option name="push-group" value="FuncFuzzerTest.push"/>
     </target_preparer>
diff --git a/config/automotive/vehicle/V2_1/iface_fuzzer/AndroidTest.xml b/config/automotive/vehicle/V2_1/iface_fuzzer/AndroidTest.xml
index c66d086..2eff584 100644
--- a/config/automotive/vehicle/V2_1/iface_fuzzer/AndroidTest.xml
+++ b/config/automotive/vehicle/V2_1/iface_fuzzer/AndroidTest.xml
@@ -3,6 +3,7 @@
      Do not edit manually.
 -->
 <configuration description="Config for VtsHalAutomotiveVehicleV2_1IfaceFuzzer test cases">
+    <option name="config-descriptor:metadata" key="plan" value="vts-misc" />
     <target_preparer class="com.android.compatibility.common.tradefed.targetprep.VtsFilePusher">
         <option name="push-group" value="IfaceFuzzerTest.push"/>
     </target_preparer>
diff --git a/config/biometrics/fingerprint/V2_1/func_fuzzer/AndroidTest.xml b/config/biometrics/fingerprint/V2_1/func_fuzzer/AndroidTest.xml
index df0dafd..501372d 100644
--- a/config/biometrics/fingerprint/V2_1/func_fuzzer/AndroidTest.xml
+++ b/config/biometrics/fingerprint/V2_1/func_fuzzer/AndroidTest.xml
@@ -3,6 +3,7 @@
      Do not edit manually.
 -->
 <configuration description="Config for VtsHalBiometricsFingerprintV2_1FuncFuzzer test cases">
+    <option name="config-descriptor:metadata" key="plan" value="vts-misc" />
     <target_preparer class="com.android.compatibility.common.tradefed.targetprep.VtsFilePusher">
         <option name="push-group" value="FuncFuzzerTest.push"/>
     </target_preparer>
diff --git a/config/biometrics/fingerprint/V2_1/iface_fuzzer/AndroidTest.xml b/config/biometrics/fingerprint/V2_1/iface_fuzzer/AndroidTest.xml
index dcbe710..6e746df 100644
--- a/config/biometrics/fingerprint/V2_1/iface_fuzzer/AndroidTest.xml
+++ b/config/biometrics/fingerprint/V2_1/iface_fuzzer/AndroidTest.xml
@@ -3,6 +3,7 @@
      Do not edit manually.
 -->
 <configuration description="Config for VtsHalBiometricsFingerprintV2_1IfaceFuzzer test cases">
+    <option name="config-descriptor:metadata" key="plan" value="vts-staging-fuzz" />
     <target_preparer class="com.android.compatibility.common.tradefed.targetprep.VtsFilePusher">
         <option name="push-group" value="IfaceFuzzerTest.push"/>
     </target_preparer>
diff --git a/config/bluetooth/V1_0/func_fuzzer/AndroidTest.xml b/config/bluetooth/V1_0/func_fuzzer/AndroidTest.xml
index c44e5c3..fb63d11 100644
--- a/config/bluetooth/V1_0/func_fuzzer/AndroidTest.xml
+++ b/config/bluetooth/V1_0/func_fuzzer/AndroidTest.xml
@@ -3,6 +3,7 @@
      Do not edit manually.
 -->
 <configuration description="Config for VtsHalBluetoothV1_0FuncFuzzer test cases">
+    <option name="config-descriptor:metadata" key="plan" value="vts-misc" />
     <target_preparer class="com.android.compatibility.common.tradefed.targetprep.VtsFilePusher">
         <option name="push-group" value="FuncFuzzerTest.push"/>
     </target_preparer>
diff --git a/config/bluetooth/V1_0/iface_fuzzer/AndroidTest.xml b/config/bluetooth/V1_0/iface_fuzzer/AndroidTest.xml
index 914e788..51c5ec1 100644
--- a/config/bluetooth/V1_0/iface_fuzzer/AndroidTest.xml
+++ b/config/bluetooth/V1_0/iface_fuzzer/AndroidTest.xml
@@ -3,6 +3,7 @@
      Do not edit manually.
 -->
 <configuration description="Config for VtsHalBluetoothV1_0IfaceFuzzer test cases">
+    <option name="config-descriptor:metadata" key="plan" value="vts-staging-fuzz" />
     <target_preparer class="com.android.compatibility.common.tradefed.targetprep.VtsFilePusher">
         <option name="push-group" value="IfaceFuzzerTest.push"/>
     </target_preparer>
diff --git a/config/boot/V1_0/func_fuzzer/AndroidTest.xml b/config/boot/V1_0/func_fuzzer/AndroidTest.xml
index 230fe9d..cdc2e63 100644
--- a/config/boot/V1_0/func_fuzzer/AndroidTest.xml
+++ b/config/boot/V1_0/func_fuzzer/AndroidTest.xml
@@ -3,6 +3,7 @@
      Do not edit manually.
 -->
 <configuration description="Config for VtsHalBootV1_0FuncFuzzer test cases">
+    <option name="config-descriptor:metadata" key="plan" value="vts-misc" />
     <target_preparer class="com.android.compatibility.common.tradefed.targetprep.VtsFilePusher">
         <option name="push-group" value="FuncFuzzerTest.push"/>
     </target_preparer>
diff --git a/config/boot/V1_0/iface_fuzzer/AndroidTest.xml b/config/boot/V1_0/iface_fuzzer/AndroidTest.xml
index 9974345..b1c6cc4 100644
--- a/config/boot/V1_0/iface_fuzzer/AndroidTest.xml
+++ b/config/boot/V1_0/iface_fuzzer/AndroidTest.xml
@@ -3,6 +3,7 @@
      Do not edit manually.
 -->
 <configuration description="Config for VtsHalBootV1_0IfaceFuzzer test cases">
+    <option name="config-descriptor:metadata" key="plan" value="vts-misc" />
     <target_preparer class="com.android.compatibility.common.tradefed.targetprep.VtsFilePusher">
         <option name="push-group" value="IfaceFuzzerTest.push"/>
     </target_preparer>
diff --git a/config/broadcastradio/V1_0/func_fuzzer/AndroidTest.xml b/config/broadcastradio/V1_0/func_fuzzer/AndroidTest.xml
index 6daf00a..967e180 100644
--- a/config/broadcastradio/V1_0/func_fuzzer/AndroidTest.xml
+++ b/config/broadcastradio/V1_0/func_fuzzer/AndroidTest.xml
@@ -3,6 +3,7 @@
      Do not edit manually.
 -->
 <configuration description="Config for VtsHalBroadcastradioV1_0FuncFuzzer test cases">
+    <option name="config-descriptor:metadata" key="plan" value="vts-misc" />
     <target_preparer class="com.android.compatibility.common.tradefed.targetprep.VtsFilePusher">
         <option name="push-group" value="FuncFuzzerTest.push"/>
     </target_preparer>
diff --git a/config/broadcastradio/V1_0/iface_fuzzer/AndroidTest.xml b/config/broadcastradio/V1_0/iface_fuzzer/AndroidTest.xml
index d147169..4c09288 100644
--- a/config/broadcastradio/V1_0/iface_fuzzer/AndroidTest.xml
+++ b/config/broadcastradio/V1_0/iface_fuzzer/AndroidTest.xml
@@ -3,6 +3,7 @@
      Do not edit manually.
 -->
 <configuration description="Config for VtsHalBroadcastradioV1_0IfaceFuzzer test cases">
+    <option name="config-descriptor:metadata" key="plan" value="vts-misc" />
     <target_preparer class="com.android.compatibility.common.tradefed.targetprep.VtsFilePusher">
         <option name="push-group" value="IfaceFuzzerTest.push"/>
     </target_preparer>
diff --git a/config/broadcastradio/V1_1/func_fuzzer/AndroidTest.xml b/config/broadcastradio/V1_1/func_fuzzer/AndroidTest.xml
index 0b4e5c0..49f7cdf 100644
--- a/config/broadcastradio/V1_1/func_fuzzer/AndroidTest.xml
+++ b/config/broadcastradio/V1_1/func_fuzzer/AndroidTest.xml
@@ -3,6 +3,7 @@
      Do not edit manually.
 -->
 <configuration description="Config for VtsHalBroadcastradioV1_1FuncFuzzer test cases">
+    <option name="config-descriptor:metadata" key="plan" value="vts-misc" />
     <target_preparer class="com.android.compatibility.common.tradefed.targetprep.VtsFilePusher">
         <option name="push-group" value="FuncFuzzerTest.push"/>
     </target_preparer>
diff --git a/config/broadcastradio/V1_1/iface_fuzzer/AndroidTest.xml b/config/broadcastradio/V1_1/iface_fuzzer/AndroidTest.xml
index 47cf531..fb415f8 100644
--- a/config/broadcastradio/V1_1/iface_fuzzer/AndroidTest.xml
+++ b/config/broadcastradio/V1_1/iface_fuzzer/AndroidTest.xml
@@ -3,6 +3,7 @@
      Do not edit manually.
 -->
 <configuration description="Config for VtsHalBroadcastradioV1_1IfaceFuzzer test cases">
+    <option name="config-descriptor:metadata" key="plan" value="vts-misc" />
     <target_preparer class="com.android.compatibility.common.tradefed.targetprep.VtsFilePusher">
         <option name="push-group" value="IfaceFuzzerTest.push"/>
     </target_preparer>
diff --git a/config/camera/common/V1_0/func_fuzzer/AndroidTest.xml b/config/camera/common/V1_0/func_fuzzer/AndroidTest.xml
index 1118e4f..6b42c9b 100644
--- a/config/camera/common/V1_0/func_fuzzer/AndroidTest.xml
+++ b/config/camera/common/V1_0/func_fuzzer/AndroidTest.xml
@@ -3,6 +3,7 @@
      Do not edit manually.
 -->
 <configuration description="Config for VtsHalCameraCommonV1_0FuncFuzzer test cases">
+    <option name="config-descriptor:metadata" key="plan" value="vts-misc" />
     <target_preparer class="com.android.compatibility.common.tradefed.targetprep.VtsFilePusher">
         <option name="push-group" value="FuncFuzzerTest.push"/>
     </target_preparer>
diff --git a/config/camera/common/V1_0/iface_fuzzer/AndroidTest.xml b/config/camera/common/V1_0/iface_fuzzer/AndroidTest.xml
index d70762b..04044ae 100644
--- a/config/camera/common/V1_0/iface_fuzzer/AndroidTest.xml
+++ b/config/camera/common/V1_0/iface_fuzzer/AndroidTest.xml
@@ -3,6 +3,7 @@
      Do not edit manually.
 -->
 <configuration description="Config for VtsHalCameraCommonV1_0IfaceFuzzer test cases">
+    <option name="config-descriptor:metadata" key="plan" value="vts-misc" />
     <target_preparer class="com.android.compatibility.common.tradefed.targetprep.VtsFilePusher">
         <option name="push-group" value="IfaceFuzzerTest.push"/>
     </target_preparer>
diff --git a/config/camera/device/V1_0/func_fuzzer/AndroidTest.xml b/config/camera/device/V1_0/func_fuzzer/AndroidTest.xml
index cf9c197..08f9e2a 100644
--- a/config/camera/device/V1_0/func_fuzzer/AndroidTest.xml
+++ b/config/camera/device/V1_0/func_fuzzer/AndroidTest.xml
@@ -3,6 +3,7 @@
      Do not edit manually.
 -->
 <configuration description="Config for VtsHalCameraDeviceV1_0FuncFuzzer test cases">
+    <option name="config-descriptor:metadata" key="plan" value="vts-misc" />
     <target_preparer class="com.android.compatibility.common.tradefed.targetprep.VtsFilePusher">
         <option name="push-group" value="FuncFuzzerTest.push"/>
     </target_preparer>
diff --git a/config/camera/device/V1_0/iface_fuzzer/AndroidTest.xml b/config/camera/device/V1_0/iface_fuzzer/AndroidTest.xml
index d66e2bc..c97b74c 100644
--- a/config/camera/device/V1_0/iface_fuzzer/AndroidTest.xml
+++ b/config/camera/device/V1_0/iface_fuzzer/AndroidTest.xml
@@ -3,6 +3,7 @@
      Do not edit manually.
 -->
 <configuration description="Config for VtsHalCameraDeviceV1_0IfaceFuzzer test cases">
+    <option name="config-descriptor:metadata" key="plan" value="vts-misc" />
     <target_preparer class="com.android.compatibility.common.tradefed.targetprep.VtsFilePusher">
         <option name="push-group" value="IfaceFuzzerTest.push"/>
     </target_preparer>
diff --git a/config/camera/device/V3_2/func_fuzzer/AndroidTest.xml b/config/camera/device/V3_2/func_fuzzer/AndroidTest.xml
index 3059ee4..3f24035 100644
--- a/config/camera/device/V3_2/func_fuzzer/AndroidTest.xml
+++ b/config/camera/device/V3_2/func_fuzzer/AndroidTest.xml
@@ -3,6 +3,7 @@
      Do not edit manually.
 -->
 <configuration description="Config for VtsHalCameraDeviceV3_2FuncFuzzer test cases">
+    <option name="config-descriptor:metadata" key="plan" value="vts-misc" />
     <target_preparer class="com.android.compatibility.common.tradefed.targetprep.VtsFilePusher">
         <option name="push-group" value="FuncFuzzerTest.push"/>
     </target_preparer>
diff --git a/config/camera/device/V3_2/iface_fuzzer/AndroidTest.xml b/config/camera/device/V3_2/iface_fuzzer/AndroidTest.xml
index 09e218d..dfc6be4 100644
--- a/config/camera/device/V3_2/iface_fuzzer/AndroidTest.xml
+++ b/config/camera/device/V3_2/iface_fuzzer/AndroidTest.xml
@@ -3,6 +3,7 @@
      Do not edit manually.
 -->
 <configuration description="Config for VtsHalCameraDeviceV3_2IfaceFuzzer test cases">
+    <option name="config-descriptor:metadata" key="plan" value="vts-misc" />
     <target_preparer class="com.android.compatibility.common.tradefed.targetprep.VtsFilePusher">
         <option name="push-group" value="IfaceFuzzerTest.push"/>
     </target_preparer>
diff --git a/config/camera/metadata/V3_2/func_fuzzer/AndroidTest.xml b/config/camera/metadata/V3_2/func_fuzzer/AndroidTest.xml
index 0106247..580d4ea 100644
--- a/config/camera/metadata/V3_2/func_fuzzer/AndroidTest.xml
+++ b/config/camera/metadata/V3_2/func_fuzzer/AndroidTest.xml
@@ -3,6 +3,7 @@
      Do not edit manually.
 -->
 <configuration description="Config for VtsHalCameraMetadataV3_2FuncFuzzer test cases">
+    <option name="config-descriptor:metadata" key="plan" value="vts-misc" />
     <target_preparer class="com.android.compatibility.common.tradefed.targetprep.VtsFilePusher">
         <option name="push-group" value="FuncFuzzerTest.push"/>
     </target_preparer>
diff --git a/config/camera/metadata/V3_2/iface_fuzzer/AndroidTest.xml b/config/camera/metadata/V3_2/iface_fuzzer/AndroidTest.xml
index 79cce91..3e5e197 100644
--- a/config/camera/metadata/V3_2/iface_fuzzer/AndroidTest.xml
+++ b/config/camera/metadata/V3_2/iface_fuzzer/AndroidTest.xml
@@ -3,6 +3,7 @@
      Do not edit manually.
 -->
 <configuration description="Config for VtsHalCameraMetadataV3_2IfaceFuzzer test cases">
+    <option name="config-descriptor:metadata" key="plan" value="vts-misc" />
     <target_preparer class="com.android.compatibility.common.tradefed.targetprep.VtsFilePusher">
         <option name="push-group" value="IfaceFuzzerTest.push"/>
     </target_preparer>
diff --git a/config/camera/provider/V2_4/func_fuzzer/AndroidTest.xml b/config/camera/provider/V2_4/func_fuzzer/AndroidTest.xml
index f125ae1..5e6c27c 100644
--- a/config/camera/provider/V2_4/func_fuzzer/AndroidTest.xml
+++ b/config/camera/provider/V2_4/func_fuzzer/AndroidTest.xml
@@ -3,6 +3,7 @@
      Do not edit manually.
 -->
 <configuration description="Config for VtsHalCameraProviderV2_4FuncFuzzer test cases">
+    <option name="config-descriptor:metadata" key="plan" value="vts-misc" />
     <target_preparer class="com.android.compatibility.common.tradefed.targetprep.VtsFilePusher">
         <option name="push-group" value="FuncFuzzerTest.push"/>
     </target_preparer>
diff --git a/config/camera/provider/V2_4/iface_fuzzer/AndroidTest.xml b/config/camera/provider/V2_4/iface_fuzzer/AndroidTest.xml
index 8379609..023f6fe 100644
--- a/config/camera/provider/V2_4/iface_fuzzer/AndroidTest.xml
+++ b/config/camera/provider/V2_4/iface_fuzzer/AndroidTest.xml
@@ -3,6 +3,7 @@
      Do not edit manually.
 -->
 <configuration description="Config for VtsHalCameraProviderV2_4IfaceFuzzer test cases">
+    <option name="config-descriptor:metadata" key="plan" value="vts-misc" />
     <target_preparer class="com.android.compatibility.common.tradefed.targetprep.VtsFilePusher">
         <option name="push-group" value="IfaceFuzzerTest.push"/>
     </target_preparer>
diff --git a/config/configstore/V1_0/func_fuzzer/AndroidTest.xml b/config/configstore/V1_0/func_fuzzer/AndroidTest.xml
index c7fa95e..d56fc2c 100644
--- a/config/configstore/V1_0/func_fuzzer/AndroidTest.xml
+++ b/config/configstore/V1_0/func_fuzzer/AndroidTest.xml
@@ -3,6 +3,7 @@
      Do not edit manually.
 -->
 <configuration description="Config for VtsHalConfigstoreV1_0FuncFuzzer test cases">
+    <option name="config-descriptor:metadata" key="plan" value="vts-misc" />
     <target_preparer class="com.android.compatibility.common.tradefed.targetprep.VtsFilePusher">
         <option name="push-group" value="FuncFuzzerTest.push"/>
     </target_preparer>
diff --git a/config/configstore/V1_0/iface_fuzzer/AndroidTest.xml b/config/configstore/V1_0/iface_fuzzer/AndroidTest.xml
index 46194da..d49bb43 100644
--- a/config/configstore/V1_0/iface_fuzzer/AndroidTest.xml
+++ b/config/configstore/V1_0/iface_fuzzer/AndroidTest.xml
@@ -3,6 +3,7 @@
      Do not edit manually.
 -->
 <configuration description="Config for VtsHalConfigstoreV1_0IfaceFuzzer test cases">
+    <option name="config-descriptor:metadata" key="plan" value="vts-fuzz" />
     <target_preparer class="com.android.compatibility.common.tradefed.targetprep.VtsFilePusher">
         <option name="push-group" value="IfaceFuzzerTest.push"/>
     </target_preparer>
diff --git a/config/contexthub/V1_0/func_fuzzer/AndroidTest.xml b/config/contexthub/V1_0/func_fuzzer/AndroidTest.xml
index ad5bdfe..dc99a28 100644
--- a/config/contexthub/V1_0/func_fuzzer/AndroidTest.xml
+++ b/config/contexthub/V1_0/func_fuzzer/AndroidTest.xml
@@ -3,6 +3,7 @@
      Do not edit manually.
 -->
 <configuration description="Config for VtsHalContexthubV1_0FuncFuzzer test cases">
+    <option name="config-descriptor:metadata" key="plan" value="vts-misc" />
     <target_preparer class="com.android.compatibility.common.tradefed.targetprep.VtsFilePusher">
         <option name="push-group" value="FuncFuzzerTest.push"/>
     </target_preparer>
diff --git a/config/contexthub/V1_0/iface_fuzzer/AndroidTest.xml b/config/contexthub/V1_0/iface_fuzzer/AndroidTest.xml
index 006bde4..bd796d5 100644
--- a/config/contexthub/V1_0/iface_fuzzer/AndroidTest.xml
+++ b/config/contexthub/V1_0/iface_fuzzer/AndroidTest.xml
@@ -3,6 +3,7 @@
      Do not edit manually.
 -->
 <configuration description="Config for VtsHalContexthubV1_0IfaceFuzzer test cases">
+    <option name="config-descriptor:metadata" key="plan" value="vts-staging-fuzz" />
     <target_preparer class="com.android.compatibility.common.tradefed.targetprep.VtsFilePusher">
         <option name="push-group" value="IfaceFuzzerTest.push"/>
     </target_preparer>
diff --git a/config/drm/V1_0/func_fuzzer/AndroidTest.xml b/config/drm/V1_0/func_fuzzer/AndroidTest.xml
index f5058c3..bd72c06 100644
--- a/config/drm/V1_0/func_fuzzer/AndroidTest.xml
+++ b/config/drm/V1_0/func_fuzzer/AndroidTest.xml
@@ -3,6 +3,7 @@
      Do not edit manually.
 -->
 <configuration description="Config for VtsHalDrmV1_0FuncFuzzer test cases">
+    <option name="config-descriptor:metadata" key="plan" value="vts-misc" />
     <target_preparer class="com.android.compatibility.common.tradefed.targetprep.VtsFilePusher">
         <option name="push-group" value="FuncFuzzerTest.push"/>
     </target_preparer>
diff --git a/config/drm/V1_0/iface_fuzzer/AndroidTest.xml b/config/drm/V1_0/iface_fuzzer/AndroidTest.xml
index bb054e5..3dcfbd6 100644
--- a/config/drm/V1_0/iface_fuzzer/AndroidTest.xml
+++ b/config/drm/V1_0/iface_fuzzer/AndroidTest.xml
@@ -3,6 +3,7 @@
      Do not edit manually.
 -->
 <configuration description="Config for VtsHalDrmV1_0IfaceFuzzer test cases">
+    <option name="config-descriptor:metadata" key="plan" value="vts-misc" />
     <target_preparer class="com.android.compatibility.common.tradefed.targetprep.VtsFilePusher">
         <option name="push-group" value="IfaceFuzzerTest.push"/>
     </target_preparer>
diff --git a/config/dumpstate/V1_0/func_fuzzer/AndroidTest.xml b/config/dumpstate/V1_0/func_fuzzer/AndroidTest.xml
index 47cae29..275402c 100644
--- a/config/dumpstate/V1_0/func_fuzzer/AndroidTest.xml
+++ b/config/dumpstate/V1_0/func_fuzzer/AndroidTest.xml
@@ -3,6 +3,7 @@
      Do not edit manually.
 -->
 <configuration description="Config for VtsHalDumpstateV1_0FuncFuzzer test cases">
+    <option name="config-descriptor:metadata" key="plan" value="vts-misc" />
     <target_preparer class="com.android.compatibility.common.tradefed.targetprep.VtsFilePusher">
         <option name="push-group" value="FuncFuzzerTest.push"/>
     </target_preparer>
diff --git a/config/dumpstate/V1_0/iface_fuzzer/AndroidTest.xml b/config/dumpstate/V1_0/iface_fuzzer/AndroidTest.xml
index cf39ad8..9448c28 100644
--- a/config/dumpstate/V1_0/iface_fuzzer/AndroidTest.xml
+++ b/config/dumpstate/V1_0/iface_fuzzer/AndroidTest.xml
@@ -3,6 +3,7 @@
      Do not edit manually.
 -->
 <configuration description="Config for VtsHalDumpstateV1_0IfaceFuzzer test cases">
+    <option name="config-descriptor:metadata" key="plan" value="vts-fuzz" />
     <target_preparer class="com.android.compatibility.common.tradefed.targetprep.VtsFilePusher">
         <option name="push-group" value="IfaceFuzzerTest.push"/>
     </target_preparer>
diff --git a/config/gatekeeper/V1_0/func_fuzzer/AndroidTest.xml b/config/gatekeeper/V1_0/func_fuzzer/AndroidTest.xml
index 0c3df52..e41b688 100644
--- a/config/gatekeeper/V1_0/func_fuzzer/AndroidTest.xml
+++ b/config/gatekeeper/V1_0/func_fuzzer/AndroidTest.xml
@@ -3,6 +3,7 @@
      Do not edit manually.
 -->
 <configuration description="Config for VtsHalGatekeeperV1_0FuncFuzzer test cases">
+    <option name="config-descriptor:metadata" key="plan" value="vts-misc" />
     <target_preparer class="com.android.compatibility.common.tradefed.targetprep.VtsFilePusher">
         <option name="push-group" value="FuncFuzzerTest.push"/>
     </target_preparer>
diff --git a/config/gatekeeper/V1_0/iface_fuzzer/AndroidTest.xml b/config/gatekeeper/V1_0/iface_fuzzer/AndroidTest.xml
index f5b6f8c..74ce1ac 100644
--- a/config/gatekeeper/V1_0/iface_fuzzer/AndroidTest.xml
+++ b/config/gatekeeper/V1_0/iface_fuzzer/AndroidTest.xml
@@ -3,6 +3,7 @@
      Do not edit manually.
 -->
 <configuration description="Config for VtsHalGatekeeperV1_0IfaceFuzzer test cases">
+    <option name="config-descriptor:metadata" key="plan" value="vts-fuzz" />
     <target_preparer class="com.android.compatibility.common.tradefed.targetprep.VtsFilePusher">
         <option name="push-group" value="IfaceFuzzerTest.push"/>
     </target_preparer>
diff --git a/config/gnss/V1_0/func_fuzzer/AndroidTest.xml b/config/gnss/V1_0/func_fuzzer/AndroidTest.xml
index 1cde5e4..1c2f0e3 100644
--- a/config/gnss/V1_0/func_fuzzer/AndroidTest.xml
+++ b/config/gnss/V1_0/func_fuzzer/AndroidTest.xml
@@ -3,6 +3,7 @@
      Do not edit manually.
 -->
 <configuration description="Config for VtsHalGnssV1_0FuncFuzzer test cases">
+    <option name="config-descriptor:metadata" key="plan" value="vts-misc" />
     <target_preparer class="com.android.compatibility.common.tradefed.targetprep.VtsFilePusher">
         <option name="push-group" value="FuncFuzzerTest.push"/>
     </target_preparer>
diff --git a/config/gnss/V1_0/iface_fuzzer/AndroidTest.xml b/config/gnss/V1_0/iface_fuzzer/AndroidTest.xml
index 4b6176a..f2629e7 100644
--- a/config/gnss/V1_0/iface_fuzzer/AndroidTest.xml
+++ b/config/gnss/V1_0/iface_fuzzer/AndroidTest.xml
@@ -3,6 +3,7 @@
      Do not edit manually.
 -->
 <configuration description="Config for VtsHalGnssV1_0IfaceFuzzer test cases">
+    <option name="config-descriptor:metadata" key="plan" value="vts-staging-fuzz" />
     <target_preparer class="com.android.compatibility.common.tradefed.targetprep.VtsFilePusher">
         <option name="push-group" value="IfaceFuzzerTest.push"/>
     </target_preparer>
diff --git a/config/graphics/allocator/V2_0/func_fuzzer/AndroidTest.xml b/config/graphics/allocator/V2_0/func_fuzzer/AndroidTest.xml
index c95b9f6..3329172 100644
--- a/config/graphics/allocator/V2_0/func_fuzzer/AndroidTest.xml
+++ b/config/graphics/allocator/V2_0/func_fuzzer/AndroidTest.xml
@@ -3,6 +3,7 @@
      Do not edit manually.
 -->
 <configuration description="Config for VtsHalGraphicsAllocatorV2_0FuncFuzzer test cases">
+    <option name="config-descriptor:metadata" key="plan" value="vts-misc" />
     <target_preparer class="com.android.compatibility.common.tradefed.targetprep.VtsFilePusher">
         <option name="push-group" value="FuncFuzzerTest.push"/>
     </target_preparer>
diff --git a/config/graphics/allocator/V2_0/iface_fuzzer/AndroidTest.xml b/config/graphics/allocator/V2_0/iface_fuzzer/AndroidTest.xml
index b4b1ed4..4ee703c 100644
--- a/config/graphics/allocator/V2_0/iface_fuzzer/AndroidTest.xml
+++ b/config/graphics/allocator/V2_0/iface_fuzzer/AndroidTest.xml
@@ -3,6 +3,7 @@
      Do not edit manually.
 -->
 <configuration description="Config for VtsHalGraphicsAllocatorV2_0IfaceFuzzer test cases">
+    <option name="config-descriptor:metadata" key="plan" value="vts-fuzz" />
     <target_preparer class="com.android.compatibility.common.tradefed.targetprep.VtsFilePusher">
         <option name="push-group" value="IfaceFuzzerTest.push"/>
     </target_preparer>
diff --git a/config/graphics/bufferqueue/V1_0/func_fuzzer/AndroidTest.xml b/config/graphics/bufferqueue/V1_0/func_fuzzer/AndroidTest.xml
index ef93683..ef43adc 100644
--- a/config/graphics/bufferqueue/V1_0/func_fuzzer/AndroidTest.xml
+++ b/config/graphics/bufferqueue/V1_0/func_fuzzer/AndroidTest.xml
@@ -3,6 +3,7 @@
      Do not edit manually.
 -->
 <configuration description="Config for VtsHalGraphicsBufferqueueV1_0FuncFuzzer test cases">
+    <option name="config-descriptor:metadata" key="plan" value="vts-misc" />
     <target_preparer class="com.android.compatibility.common.tradefed.targetprep.VtsFilePusher">
         <option name="push-group" value="FuncFuzzerTest.push"/>
     </target_preparer>
diff --git a/config/graphics/bufferqueue/V1_0/iface_fuzzer/AndroidTest.xml b/config/graphics/bufferqueue/V1_0/iface_fuzzer/AndroidTest.xml
index a4b576d..9ab6b3a 100644
--- a/config/graphics/bufferqueue/V1_0/iface_fuzzer/AndroidTest.xml
+++ b/config/graphics/bufferqueue/V1_0/iface_fuzzer/AndroidTest.xml
@@ -3,6 +3,7 @@
      Do not edit manually.
 -->
 <configuration description="Config for VtsHalGraphicsBufferqueueV1_0IfaceFuzzer test cases">
+    <option name="config-descriptor:metadata" key="plan" value="vts-misc" />
     <target_preparer class="com.android.compatibility.common.tradefed.targetprep.VtsFilePusher">
         <option name="push-group" value="IfaceFuzzerTest.push"/>
     </target_preparer>
diff --git a/config/graphics/common/V1_0/func_fuzzer/AndroidTest.xml b/config/graphics/common/V1_0/func_fuzzer/AndroidTest.xml
index ad3bb30..c6880d0 100644
--- a/config/graphics/common/V1_0/func_fuzzer/AndroidTest.xml
+++ b/config/graphics/common/V1_0/func_fuzzer/AndroidTest.xml
@@ -3,6 +3,7 @@
      Do not edit manually.
 -->
 <configuration description="Config for VtsHalGraphicsCommonV1_0FuncFuzzer test cases">
+    <option name="config-descriptor:metadata" key="plan" value="vts-misc" />
     <target_preparer class="com.android.compatibility.common.tradefed.targetprep.VtsFilePusher">
         <option name="push-group" value="FuncFuzzerTest.push"/>
     </target_preparer>
diff --git a/config/graphics/common/V1_0/iface_fuzzer/AndroidTest.xml b/config/graphics/common/V1_0/iface_fuzzer/AndroidTest.xml
index 61fa5e5..c8105f1 100644
--- a/config/graphics/common/V1_0/iface_fuzzer/AndroidTest.xml
+++ b/config/graphics/common/V1_0/iface_fuzzer/AndroidTest.xml
@@ -3,6 +3,7 @@
      Do not edit manually.
 -->
 <configuration description="Config for VtsHalGraphicsCommonV1_0IfaceFuzzer test cases">
+    <option name="config-descriptor:metadata" key="plan" value="vts-misc" />
     <target_preparer class="com.android.compatibility.common.tradefed.targetprep.VtsFilePusher">
         <option name="push-group" value="IfaceFuzzerTest.push"/>
     </target_preparer>
diff --git a/config/graphics/composer/V2_1/func_fuzzer/AndroidTest.xml b/config/graphics/composer/V2_1/func_fuzzer/AndroidTest.xml
index fd1ada7..318157f 100644
--- a/config/graphics/composer/V2_1/func_fuzzer/AndroidTest.xml
+++ b/config/graphics/composer/V2_1/func_fuzzer/AndroidTest.xml
@@ -3,6 +3,7 @@
      Do not edit manually.
 -->
 <configuration description="Config for VtsHalGraphicsComposerV2_1FuncFuzzer test cases">
+    <option name="config-descriptor:metadata" key="plan" value="vts-misc" />
     <target_preparer class="com.android.compatibility.common.tradefed.targetprep.VtsFilePusher">
         <option name="push-group" value="FuncFuzzerTest.push"/>
     </target_preparer>
diff --git a/config/graphics/composer/V2_1/iface_fuzzer/AndroidTest.xml b/config/graphics/composer/V2_1/iface_fuzzer/AndroidTest.xml
index 6ebb2d6..bd457c0 100644
--- a/config/graphics/composer/V2_1/iface_fuzzer/AndroidTest.xml
+++ b/config/graphics/composer/V2_1/iface_fuzzer/AndroidTest.xml
@@ -3,6 +3,7 @@
      Do not edit manually.
 -->
 <configuration description="Config for VtsHalGraphicsComposerV2_1IfaceFuzzer test cases">
+    <option name="config-descriptor:metadata" key="plan" value="vts-staging-fuzz" />
     <target_preparer class="com.android.compatibility.common.tradefed.targetprep.VtsFilePusher">
         <option name="push-group" value="IfaceFuzzerTest.push"/>
     </target_preparer>
diff --git a/config/graphics/mapper/V2_0/func_fuzzer/AndroidTest.xml b/config/graphics/mapper/V2_0/func_fuzzer/AndroidTest.xml
index 602df15..6f70f86 100644
--- a/config/graphics/mapper/V2_0/func_fuzzer/AndroidTest.xml
+++ b/config/graphics/mapper/V2_0/func_fuzzer/AndroidTest.xml
@@ -3,6 +3,7 @@
      Do not edit manually.
 -->
 <configuration description="Config for VtsHalGraphicsMapperV2_0FuncFuzzer test cases">
+    <option name="config-descriptor:metadata" key="plan" value="vts-misc" />
     <target_preparer class="com.android.compatibility.common.tradefed.targetprep.VtsFilePusher">
         <option name="push-group" value="FuncFuzzerTest.push"/>
     </target_preparer>
diff --git a/config/graphics/mapper/V2_0/iface_fuzzer/AndroidTest.xml b/config/graphics/mapper/V2_0/iface_fuzzer/AndroidTest.xml
index 2f9d2b0..e326bb2 100644
--- a/config/graphics/mapper/V2_0/iface_fuzzer/AndroidTest.xml
+++ b/config/graphics/mapper/V2_0/iface_fuzzer/AndroidTest.xml
@@ -3,6 +3,7 @@
      Do not edit manually.
 -->
 <configuration description="Config for VtsHalGraphicsMapperV2_0IfaceFuzzer test cases">
+    <option name="config-descriptor:metadata" key="plan" value="vts-staging-fuzz" />
     <target_preparer class="com.android.compatibility.common.tradefed.targetprep.VtsFilePusher">
         <option name="push-group" value="IfaceFuzzerTest.push"/>
     </target_preparer>
diff --git a/config/health/V1_0/func_fuzzer/AndroidTest.xml b/config/health/V1_0/func_fuzzer/AndroidTest.xml
index cee1aa0..9d75039 100644
--- a/config/health/V1_0/func_fuzzer/AndroidTest.xml
+++ b/config/health/V1_0/func_fuzzer/AndroidTest.xml
@@ -3,6 +3,7 @@
      Do not edit manually.
 -->
 <configuration description="Config for VtsHalHealthV1_0FuncFuzzer test cases">
+    <option name="config-descriptor:metadata" key="plan" value="vts-misc" />
     <target_preparer class="com.android.compatibility.common.tradefed.targetprep.VtsFilePusher">
         <option name="push-group" value="FuncFuzzerTest.push"/>
     </target_preparer>
diff --git a/config/health/V1_0/iface_fuzzer/AndroidTest.xml b/config/health/V1_0/iface_fuzzer/AndroidTest.xml
index ba5ae5d..61a6990 100644
--- a/config/health/V1_0/iface_fuzzer/AndroidTest.xml
+++ b/config/health/V1_0/iface_fuzzer/AndroidTest.xml
@@ -3,6 +3,7 @@
      Do not edit manually.
 -->
 <configuration description="Config for VtsHalHealthV1_0IfaceFuzzer test cases">
+    <option name="config-descriptor:metadata" key="plan" value="vts-misc" />
     <target_preparer class="com.android.compatibility.common.tradefed.targetprep.VtsFilePusher">
         <option name="push-group" value="IfaceFuzzerTest.push"/>
     </target_preparer>
diff --git a/config/ir/V1_0/func_fuzzer/AndroidTest.xml b/config/ir/V1_0/func_fuzzer/AndroidTest.xml
index 3d46f11..cb1968d 100644
--- a/config/ir/V1_0/func_fuzzer/AndroidTest.xml
+++ b/config/ir/V1_0/func_fuzzer/AndroidTest.xml
@@ -3,6 +3,7 @@
      Do not edit manually.
 -->
 <configuration description="Config for VtsHalIrV1_0FuncFuzzer test cases">
+    <option name="config-descriptor:metadata" key="plan" value="vts-misc" />
     <target_preparer class="com.android.compatibility.common.tradefed.targetprep.VtsFilePusher">
         <option name="push-group" value="FuncFuzzerTest.push"/>
     </target_preparer>
diff --git a/config/ir/V1_0/iface_fuzzer/AndroidTest.xml b/config/ir/V1_0/iface_fuzzer/AndroidTest.xml
index 1987f55..83d0064 100644
--- a/config/ir/V1_0/iface_fuzzer/AndroidTest.xml
+++ b/config/ir/V1_0/iface_fuzzer/AndroidTest.xml
@@ -3,6 +3,7 @@
      Do not edit manually.
 -->
 <configuration description="Config for VtsHalIrV1_0IfaceFuzzer test cases">
+    <option name="config-descriptor:metadata" key="plan" value="vts-misc" />
     <target_preparer class="com.android.compatibility.common.tradefed.targetprep.VtsFilePusher">
         <option name="push-group" value="IfaceFuzzerTest.push"/>
     </target_preparer>
diff --git a/config/keymaster/V3_0/func_fuzzer/AndroidTest.xml b/config/keymaster/V3_0/func_fuzzer/AndroidTest.xml
index eb20393..62a8aeb 100644
--- a/config/keymaster/V3_0/func_fuzzer/AndroidTest.xml
+++ b/config/keymaster/V3_0/func_fuzzer/AndroidTest.xml
@@ -3,6 +3,7 @@
      Do not edit manually.
 -->
 <configuration description="Config for VtsHalKeymasterV3_0FuncFuzzer test cases">
+    <option name="config-descriptor:metadata" key="plan" value="vts-misc" />
     <target_preparer class="com.android.compatibility.common.tradefed.targetprep.VtsFilePusher">
         <option name="push-group" value="FuncFuzzerTest.push"/>
     </target_preparer>
diff --git a/config/keymaster/V3_0/iface_fuzzer/AndroidTest.xml b/config/keymaster/V3_0/iface_fuzzer/AndroidTest.xml
index 0bdae4d..d5354f9 100644
--- a/config/keymaster/V3_0/iface_fuzzer/AndroidTest.xml
+++ b/config/keymaster/V3_0/iface_fuzzer/AndroidTest.xml
@@ -3,6 +3,7 @@
      Do not edit manually.
 -->
 <configuration description="Config for VtsHalKeymasterV3_0IfaceFuzzer test cases">
+    <option name="config-descriptor:metadata" key="plan" value="vts-staging-fuzz" />
     <target_preparer class="com.android.compatibility.common.tradefed.targetprep.VtsFilePusher">
         <option name="push-group" value="IfaceFuzzerTest.push"/>
     </target_preparer>
diff --git a/config/light/V2_0/func_fuzzer/AndroidTest.xml b/config/light/V2_0/func_fuzzer/AndroidTest.xml
index 44b1702..a21c125 100644
--- a/config/light/V2_0/func_fuzzer/AndroidTest.xml
+++ b/config/light/V2_0/func_fuzzer/AndroidTest.xml
@@ -3,6 +3,7 @@
      Do not edit manually.
 -->
 <configuration description="Config for VtsHalLightV2_0FuncFuzzer test cases">
+    <option name="config-descriptor:metadata" key="plan" value="vts-misc" />
     <target_preparer class="com.android.compatibility.common.tradefed.targetprep.VtsFilePusher">
         <option name="push-group" value="FuncFuzzerTest.push"/>
     </target_preparer>
diff --git a/config/light/V2_0/iface_fuzzer/AndroidTest.xml b/config/light/V2_0/iface_fuzzer/AndroidTest.xml
index f2857a4..091c4b5 100644
--- a/config/light/V2_0/iface_fuzzer/AndroidTest.xml
+++ b/config/light/V2_0/iface_fuzzer/AndroidTest.xml
@@ -3,6 +3,7 @@
      Do not edit manually.
 -->
 <configuration description="Config for VtsHalLightV2_0IfaceFuzzer test cases">
+    <option name="config-descriptor:metadata" key="plan" value="vts-fuzz" />
     <target_preparer class="com.android.compatibility.common.tradefed.targetprep.VtsFilePusher">
         <option name="push-group" value="IfaceFuzzerTest.push"/>
     </target_preparer>
diff --git a/config/media/V1_0/func_fuzzer/AndroidTest.xml b/config/media/V1_0/func_fuzzer/AndroidTest.xml
index e03ae4d..b3f10b8 100644
--- a/config/media/V1_0/func_fuzzer/AndroidTest.xml
+++ b/config/media/V1_0/func_fuzzer/AndroidTest.xml
@@ -3,6 +3,7 @@
      Do not edit manually.
 -->
 <configuration description="Config for VtsHalMediaV1_0FuncFuzzer test cases">
+    <option name="config-descriptor:metadata" key="plan" value="vts-misc" />
     <target_preparer class="com.android.compatibility.common.tradefed.targetprep.VtsFilePusher">
         <option name="push-group" value="FuncFuzzerTest.push"/>
     </target_preparer>
diff --git a/config/media/V1_0/iface_fuzzer/AndroidTest.xml b/config/media/V1_0/iface_fuzzer/AndroidTest.xml
index d9e0f55..4118664 100644
--- a/config/media/V1_0/iface_fuzzer/AndroidTest.xml
+++ b/config/media/V1_0/iface_fuzzer/AndroidTest.xml
@@ -3,6 +3,7 @@
      Do not edit manually.
 -->
 <configuration description="Config for VtsHalMediaV1_0IfaceFuzzer test cases">
+    <option name="config-descriptor:metadata" key="plan" value="vts-misc" />
     <target_preparer class="com.android.compatibility.common.tradefed.targetprep.VtsFilePusher">
         <option name="push-group" value="IfaceFuzzerTest.push"/>
     </target_preparer>
diff --git a/config/media/omx/V1_0/func_fuzzer/AndroidTest.xml b/config/media/omx/V1_0/func_fuzzer/AndroidTest.xml
index 72e474e..93e32f3 100644
--- a/config/media/omx/V1_0/func_fuzzer/AndroidTest.xml
+++ b/config/media/omx/V1_0/func_fuzzer/AndroidTest.xml
@@ -3,6 +3,7 @@
      Do not edit manually.
 -->
 <configuration description="Config for VtsHalMediaOmxV1_0FuncFuzzer test cases">
+    <option name="config-descriptor:metadata" key="plan" value="vts-misc" />
     <target_preparer class="com.android.compatibility.common.tradefed.targetprep.VtsFilePusher">
         <option name="push-group" value="FuncFuzzerTest.push"/>
     </target_preparer>
diff --git a/config/media/omx/V1_0/iface_fuzzer/AndroidTest.xml b/config/media/omx/V1_0/iface_fuzzer/AndroidTest.xml
index afe5e4f..1f0591f 100644
--- a/config/media/omx/V1_0/iface_fuzzer/AndroidTest.xml
+++ b/config/media/omx/V1_0/iface_fuzzer/AndroidTest.xml
@@ -3,6 +3,7 @@
      Do not edit manually.
 -->
 <configuration description="Config for VtsHalMediaOmxV1_0IfaceFuzzer test cases">
+    <option name="config-descriptor:metadata" key="plan" value="vts-staging-fuzz" />
     <target_preparer class="com.android.compatibility.common.tradefed.targetprep.VtsFilePusher">
         <option name="push-group" value="IfaceFuzzerTest.push"/>
     </target_preparer>
diff --git a/config/memtrack/V1_0/func_fuzzer/AndroidTest.xml b/config/memtrack/V1_0/func_fuzzer/AndroidTest.xml
index ee2f8ff..a30db1c 100644
--- a/config/memtrack/V1_0/func_fuzzer/AndroidTest.xml
+++ b/config/memtrack/V1_0/func_fuzzer/AndroidTest.xml
@@ -3,6 +3,7 @@
      Do not edit manually.
 -->
 <configuration description="Config for VtsHalMemtrackV1_0FuncFuzzer test cases">
+    <option name="config-descriptor:metadata" key="plan" value="vts-misc" />
     <target_preparer class="com.android.compatibility.common.tradefed.targetprep.VtsFilePusher">
         <option name="push-group" value="FuncFuzzerTest.push"/>
     </target_preparer>
diff --git a/config/memtrack/V1_0/iface_fuzzer/AndroidTest.xml b/config/memtrack/V1_0/iface_fuzzer/AndroidTest.xml
index 7e17e6c..80a7803 100644
--- a/config/memtrack/V1_0/iface_fuzzer/AndroidTest.xml
+++ b/config/memtrack/V1_0/iface_fuzzer/AndroidTest.xml
@@ -3,6 +3,7 @@
      Do not edit manually.
 -->
 <configuration description="Config for VtsHalMemtrackV1_0IfaceFuzzer test cases">
+    <option name="config-descriptor:metadata" key="plan" value="vts-fuzz" />
     <target_preparer class="com.android.compatibility.common.tradefed.targetprep.VtsFilePusher">
         <option name="push-group" value="IfaceFuzzerTest.push"/>
     </target_preparer>
diff --git a/config/nfc/V1_0/func_fuzzer/AndroidTest.xml b/config/nfc/V1_0/func_fuzzer/AndroidTest.xml
index 0b8368a..112f82f 100644
--- a/config/nfc/V1_0/func_fuzzer/AndroidTest.xml
+++ b/config/nfc/V1_0/func_fuzzer/AndroidTest.xml
@@ -3,6 +3,7 @@
      Do not edit manually.
 -->
 <configuration description="Config for VtsHalNfcV1_0FuncFuzzer test cases">
+    <option name="config-descriptor:metadata" key="plan" value="vts-misc" />
     <target_preparer class="com.android.compatibility.common.tradefed.targetprep.VtsFilePusher">
         <option name="push-group" value="FuncFuzzerTest.push"/>
     </target_preparer>
diff --git a/config/nfc/V1_0/iface_fuzzer/AndroidTest.xml b/config/nfc/V1_0/iface_fuzzer/AndroidTest.xml
index 7d9bea5..939929d 100644
--- a/config/nfc/V1_0/iface_fuzzer/AndroidTest.xml
+++ b/config/nfc/V1_0/iface_fuzzer/AndroidTest.xml
@@ -3,6 +3,7 @@
      Do not edit manually.
 -->
 <configuration description="Config for VtsHalNfcV1_0IfaceFuzzer test cases">
+    <option name="config-descriptor:metadata" key="plan" value="vts-staging-fuzz" />
     <target_preparer class="com.android.compatibility.common.tradefed.targetprep.VtsFilePusher">
         <option name="push-group" value="IfaceFuzzerTest.push"/>
     </target_preparer>
diff --git a/config/power/V1_0/func_fuzzer/AndroidTest.xml b/config/power/V1_0/func_fuzzer/AndroidTest.xml
index 0469cb4..1dc800e 100644
--- a/config/power/V1_0/func_fuzzer/AndroidTest.xml
+++ b/config/power/V1_0/func_fuzzer/AndroidTest.xml
@@ -3,6 +3,7 @@
      Do not edit manually.
 -->
 <configuration description="Config for VtsHalPowerV1_0FuncFuzzer test cases">
+    <option name="config-descriptor:metadata" key="plan" value="vts-misc" />
     <target_preparer class="com.android.compatibility.common.tradefed.targetprep.VtsFilePusher">
         <option name="push-group" value="FuncFuzzerTest.push"/>
     </target_preparer>
diff --git a/config/power/V1_0/iface_fuzzer/AndroidTest.xml b/config/power/V1_0/iface_fuzzer/AndroidTest.xml
index b78c77b..6be636a 100644
--- a/config/power/V1_0/iface_fuzzer/AndroidTest.xml
+++ b/config/power/V1_0/iface_fuzzer/AndroidTest.xml
@@ -3,6 +3,7 @@
      Do not edit manually.
 -->
 <configuration description="Config for VtsHalPowerV1_0IfaceFuzzer test cases">
+    <option name="config-descriptor:metadata" key="plan" value="vts-fuzz" />
     <target_preparer class="com.android.compatibility.common.tradefed.targetprep.VtsFilePusher">
         <option name="push-group" value="IfaceFuzzerTest.push"/>
     </target_preparer>
diff --git a/config/radio/V1_0/func_fuzzer/AndroidTest.xml b/config/radio/V1_0/func_fuzzer/AndroidTest.xml
index f19ad5c..a49019a 100644
--- a/config/radio/V1_0/func_fuzzer/AndroidTest.xml
+++ b/config/radio/V1_0/func_fuzzer/AndroidTest.xml
@@ -3,6 +3,7 @@
      Do not edit manually.
 -->
 <configuration description="Config for VtsHalRadioV1_0FuncFuzzer test cases">
+    <option name="config-descriptor:metadata" key="plan" value="vts-misc" />
     <target_preparer class="com.android.compatibility.common.tradefed.targetprep.VtsFilePusher">
         <option name="push-group" value="FuncFuzzerTest.push"/>
     </target_preparer>
diff --git a/config/radio/V1_0/iface_fuzzer/AndroidTest.xml b/config/radio/V1_0/iface_fuzzer/AndroidTest.xml
index 4770a9b..3e93753 100644
--- a/config/radio/V1_0/iface_fuzzer/AndroidTest.xml
+++ b/config/radio/V1_0/iface_fuzzer/AndroidTest.xml
@@ -3,6 +3,7 @@
      Do not edit manually.
 -->
 <configuration description="Config for VtsHalRadioV1_0IfaceFuzzer test cases">
+    <option name="config-descriptor:metadata" key="plan" value="vts-staging-fuzz" />
     <target_preparer class="com.android.compatibility.common.tradefed.targetprep.VtsFilePusher">
         <option name="push-group" value="IfaceFuzzerTest.push"/>
     </target_preparer>
diff --git a/config/radio/deprecated/V1_0/func_fuzzer/AndroidTest.xml b/config/radio/deprecated/V1_0/func_fuzzer/AndroidTest.xml
index 3eeeb3e..8232908 100644
--- a/config/radio/deprecated/V1_0/func_fuzzer/AndroidTest.xml
+++ b/config/radio/deprecated/V1_0/func_fuzzer/AndroidTest.xml
@@ -3,6 +3,7 @@
      Do not edit manually.
 -->
 <configuration description="Config for VtsHalRadioDeprecatedV1_0FuncFuzzer test cases">
+    <option name="config-descriptor:metadata" key="plan" value="vts-misc" />
     <target_preparer class="com.android.compatibility.common.tradefed.targetprep.VtsFilePusher">
         <option name="push-group" value="FuncFuzzerTest.push"/>
     </target_preparer>
diff --git a/config/radio/deprecated/V1_0/iface_fuzzer/AndroidTest.xml b/config/radio/deprecated/V1_0/iface_fuzzer/AndroidTest.xml
index f25cff0..9bf56de 100644
--- a/config/radio/deprecated/V1_0/iface_fuzzer/AndroidTest.xml
+++ b/config/radio/deprecated/V1_0/iface_fuzzer/AndroidTest.xml
@@ -3,6 +3,7 @@
      Do not edit manually.
 -->
 <configuration description="Config for VtsHalRadioDeprecatedV1_0IfaceFuzzer test cases">
+    <option name="config-descriptor:metadata" key="plan" value="vts-fuzz" />
     <target_preparer class="com.android.compatibility.common.tradefed.targetprep.VtsFilePusher">
         <option name="push-group" value="IfaceFuzzerTest.push"/>
     </target_preparer>
diff --git a/config/renderscript/V1_0/func_fuzzer/AndroidTest.xml b/config/renderscript/V1_0/func_fuzzer/AndroidTest.xml
index 2692bc9..563cc37 100644
--- a/config/renderscript/V1_0/func_fuzzer/AndroidTest.xml
+++ b/config/renderscript/V1_0/func_fuzzer/AndroidTest.xml
@@ -3,6 +3,7 @@
      Do not edit manually.
 -->
 <configuration description="Config for VtsHalRenderscriptV1_0FuncFuzzer test cases">
+    <option name="config-descriptor:metadata" key="plan" value="vts-misc" />
     <target_preparer class="com.android.compatibility.common.tradefed.targetprep.VtsFilePusher">
         <option name="push-group" value="FuncFuzzerTest.push"/>
     </target_preparer>
diff --git a/config/renderscript/V1_0/iface_fuzzer/AndroidTest.xml b/config/renderscript/V1_0/iface_fuzzer/AndroidTest.xml
index 4f2b850..4029dad 100644
--- a/config/renderscript/V1_0/iface_fuzzer/AndroidTest.xml
+++ b/config/renderscript/V1_0/iface_fuzzer/AndroidTest.xml
@@ -3,6 +3,7 @@
      Do not edit manually.
 -->
 <configuration description="Config for VtsHalRenderscriptV1_0IfaceFuzzer test cases">
+    <option name="config-descriptor:metadata" key="plan" value="vts-staging-fuzz" />
     <target_preparer class="com.android.compatibility.common.tradefed.targetprep.VtsFilePusher">
         <option name="push-group" value="IfaceFuzzerTest.push"/>
     </target_preparer>
diff --git a/config/sensors/V1_0/func_fuzzer/AndroidTest.xml b/config/sensors/V1_0/func_fuzzer/AndroidTest.xml
index b851d54..390da82 100644
--- a/config/sensors/V1_0/func_fuzzer/AndroidTest.xml
+++ b/config/sensors/V1_0/func_fuzzer/AndroidTest.xml
@@ -3,6 +3,7 @@
      Do not edit manually.
 -->
 <configuration description="Config for VtsHalSensorsV1_0FuncFuzzer test cases">
+    <option name="config-descriptor:metadata" key="plan" value="vts-misc" />
     <target_preparer class="com.android.compatibility.common.tradefed.targetprep.VtsFilePusher">
         <option name="push-group" value="FuncFuzzerTest.push"/>
     </target_preparer>
diff --git a/config/sensors/V1_0/iface_fuzzer/AndroidTest.xml b/config/sensors/V1_0/iface_fuzzer/AndroidTest.xml
index 1aa7601..c69ca41 100644
--- a/config/sensors/V1_0/iface_fuzzer/AndroidTest.xml
+++ b/config/sensors/V1_0/iface_fuzzer/AndroidTest.xml
@@ -3,6 +3,7 @@
      Do not edit manually.
 -->
 <configuration description="Config for VtsHalSensorsV1_0IfaceFuzzer test cases">
+    <option name="config-descriptor:metadata" key="plan" value="vts-staging-fuzz" />
     <target_preparer class="com.android.compatibility.common.tradefed.targetprep.VtsFilePusher">
         <option name="push-group" value="IfaceFuzzerTest.push"/>
     </target_preparer>
diff --git a/config/soundtrigger/V2_0/func_fuzzer/AndroidTest.xml b/config/soundtrigger/V2_0/func_fuzzer/AndroidTest.xml
index f29cb43..63f8ee7 100644
--- a/config/soundtrigger/V2_0/func_fuzzer/AndroidTest.xml
+++ b/config/soundtrigger/V2_0/func_fuzzer/AndroidTest.xml
@@ -3,6 +3,7 @@
      Do not edit manually.
 -->
 <configuration description="Config for VtsHalSoundtriggerV2_0FuncFuzzer test cases">
+    <option name="config-descriptor:metadata" key="plan" value="vts-misc" />
     <target_preparer class="com.android.compatibility.common.tradefed.targetprep.VtsFilePusher">
         <option name="push-group" value="FuncFuzzerTest.push"/>
     </target_preparer>
diff --git a/config/soundtrigger/V2_0/iface_fuzzer/AndroidTest.xml b/config/soundtrigger/V2_0/iface_fuzzer/AndroidTest.xml
index 7ea8df8..6f5f739 100644
--- a/config/soundtrigger/V2_0/iface_fuzzer/AndroidTest.xml
+++ b/config/soundtrigger/V2_0/iface_fuzzer/AndroidTest.xml
@@ -3,6 +3,7 @@
      Do not edit manually.
 -->
 <configuration description="Config for VtsHalSoundtriggerV2_0IfaceFuzzer test cases">
+    <option name="config-descriptor:metadata" key="plan" value="vts-staging-fuzz" />
     <target_preparer class="com.android.compatibility.common.tradefed.targetprep.VtsFilePusher">
         <option name="push-group" value="IfaceFuzzerTest.push"/>
     </target_preparer>
diff --git a/config/thermal/V1_0/func_fuzzer/AndroidTest.xml b/config/thermal/V1_0/func_fuzzer/AndroidTest.xml
index dfb25fe..e58dd5a 100644
--- a/config/thermal/V1_0/func_fuzzer/AndroidTest.xml
+++ b/config/thermal/V1_0/func_fuzzer/AndroidTest.xml
@@ -3,6 +3,7 @@
      Do not edit manually.
 -->
 <configuration description="Config for VtsHalThermalV1_0FuncFuzzer test cases">
+    <option name="config-descriptor:metadata" key="plan" value="vts-misc" />
     <target_preparer class="com.android.compatibility.common.tradefed.targetprep.VtsFilePusher">
         <option name="push-group" value="FuncFuzzerTest.push"/>
     </target_preparer>
diff --git a/config/thermal/V1_0/iface_fuzzer/AndroidTest.xml b/config/thermal/V1_0/iface_fuzzer/AndroidTest.xml
index 8286a7b..e97078b 100644
--- a/config/thermal/V1_0/iface_fuzzer/AndroidTest.xml
+++ b/config/thermal/V1_0/iface_fuzzer/AndroidTest.xml
@@ -3,6 +3,7 @@
      Do not edit manually.
 -->
 <configuration description="Config for VtsHalThermalV1_0IfaceFuzzer test cases">
+    <option name="config-descriptor:metadata" key="plan" value="vts-fuzz" />
     <target_preparer class="com.android.compatibility.common.tradefed.targetprep.VtsFilePusher">
         <option name="push-group" value="IfaceFuzzerTest.push"/>
     </target_preparer>
diff --git a/config/tv/cec/V1_0/func_fuzzer/AndroidTest.xml b/config/tv/cec/V1_0/func_fuzzer/AndroidTest.xml
index b7bdddb..32a96b0 100644
--- a/config/tv/cec/V1_0/func_fuzzer/AndroidTest.xml
+++ b/config/tv/cec/V1_0/func_fuzzer/AndroidTest.xml
@@ -3,6 +3,7 @@
      Do not edit manually.
 -->
 <configuration description="Config for VtsHalTvCecV1_0FuncFuzzer test cases">
+    <option name="config-descriptor:metadata" key="plan" value="vts-misc" />
     <target_preparer class="com.android.compatibility.common.tradefed.targetprep.VtsFilePusher">
         <option name="push-group" value="FuncFuzzerTest.push"/>
     </target_preparer>
diff --git a/config/tv/cec/V1_0/iface_fuzzer/AndroidTest.xml b/config/tv/cec/V1_0/iface_fuzzer/AndroidTest.xml
index 419f852..40b8b1d 100644
--- a/config/tv/cec/V1_0/iface_fuzzer/AndroidTest.xml
+++ b/config/tv/cec/V1_0/iface_fuzzer/AndroidTest.xml
@@ -3,6 +3,7 @@
      Do not edit manually.
 -->
 <configuration description="Config for VtsHalTvCecV1_0IfaceFuzzer test cases">
+    <option name="config-descriptor:metadata" key="plan" value="vts-misc" />
     <target_preparer class="com.android.compatibility.common.tradefed.targetprep.VtsFilePusher">
         <option name="push-group" value="IfaceFuzzerTest.push"/>
     </target_preparer>
diff --git a/config/tv/input/V1_0/func_fuzzer/AndroidTest.xml b/config/tv/input/V1_0/func_fuzzer/AndroidTest.xml
index d2b162c..8953c3a 100644
--- a/config/tv/input/V1_0/func_fuzzer/AndroidTest.xml
+++ b/config/tv/input/V1_0/func_fuzzer/AndroidTest.xml
@@ -3,6 +3,7 @@
      Do not edit manually.
 -->
 <configuration description="Config for VtsHalTvInputV1_0FuncFuzzer test cases">
+    <option name="config-descriptor:metadata" key="plan" value="vts-misc" />
     <target_preparer class="com.android.compatibility.common.tradefed.targetprep.VtsFilePusher">
         <option name="push-group" value="FuncFuzzerTest.push"/>
     </target_preparer>
diff --git a/config/tv/input/V1_0/iface_fuzzer/AndroidTest.xml b/config/tv/input/V1_0/iface_fuzzer/AndroidTest.xml
index f54aa4d..9d581c6 100644
--- a/config/tv/input/V1_0/iface_fuzzer/AndroidTest.xml
+++ b/config/tv/input/V1_0/iface_fuzzer/AndroidTest.xml
@@ -3,6 +3,7 @@
      Do not edit manually.
 -->
 <configuration description="Config for VtsHalTvInputV1_0IfaceFuzzer test cases">
+    <option name="config-descriptor:metadata" key="plan" value="vts-misc" />
     <target_preparer class="com.android.compatibility.common.tradefed.targetprep.VtsFilePusher">
         <option name="push-group" value="IfaceFuzzerTest.push"/>
     </target_preparer>
diff --git a/config/usb/V1_0/func_fuzzer/AndroidTest.xml b/config/usb/V1_0/func_fuzzer/AndroidTest.xml
index 15c52e1..1134378 100644
--- a/config/usb/V1_0/func_fuzzer/AndroidTest.xml
+++ b/config/usb/V1_0/func_fuzzer/AndroidTest.xml
@@ -3,6 +3,7 @@
      Do not edit manually.
 -->
 <configuration description="Config for VtsHalUsbV1_0FuncFuzzer test cases">
+    <option name="config-descriptor:metadata" key="plan" value="vts-misc" />
     <target_preparer class="com.android.compatibility.common.tradefed.targetprep.VtsFilePusher">
         <option name="push-group" value="FuncFuzzerTest.push"/>
     </target_preparer>
diff --git a/config/usb/V1_0/iface_fuzzer/AndroidTest.xml b/config/usb/V1_0/iface_fuzzer/AndroidTest.xml
index 99a61ea..a16663a 100644
--- a/config/usb/V1_0/iface_fuzzer/AndroidTest.xml
+++ b/config/usb/V1_0/iface_fuzzer/AndroidTest.xml
@@ -3,6 +3,7 @@
      Do not edit manually.
 -->
 <configuration description="Config for VtsHalUsbV1_0IfaceFuzzer test cases">
+    <option name="config-descriptor:metadata" key="plan" value="vts-staging-fuzz" />
     <target_preparer class="com.android.compatibility.common.tradefed.targetprep.VtsFilePusher">
         <option name="push-group" value="IfaceFuzzerTest.push"/>
     </target_preparer>
diff --git a/config/vibrator/V1_0/func_fuzzer/AndroidTest.xml b/config/vibrator/V1_0/func_fuzzer/AndroidTest.xml
index 643de88..623b8ab 100644
--- a/config/vibrator/V1_0/func_fuzzer/AndroidTest.xml
+++ b/config/vibrator/V1_0/func_fuzzer/AndroidTest.xml
@@ -3,6 +3,7 @@
      Do not edit manually.
 -->
 <configuration description="Config for VtsHalVibratorV1_0FuncFuzzer test cases">
+    <option name="config-descriptor:metadata" key="plan" value="vts-misc" />
     <target_preparer class="com.android.compatibility.common.tradefed.targetprep.VtsFilePusher">
         <option name="push-group" value="FuncFuzzerTest.push"/>
     </target_preparer>
diff --git a/config/vibrator/V1_0/iface_fuzzer/AndroidTest.xml b/config/vibrator/V1_0/iface_fuzzer/AndroidTest.xml
index 8b03cf7..283c8ed 100644
--- a/config/vibrator/V1_0/iface_fuzzer/AndroidTest.xml
+++ b/config/vibrator/V1_0/iface_fuzzer/AndroidTest.xml
@@ -3,6 +3,7 @@
      Do not edit manually.
 -->
 <configuration description="Config for VtsHalVibratorV1_0IfaceFuzzer test cases">
+    <option name="config-descriptor:metadata" key="plan" value="vts-fuzz" />
     <target_preparer class="com.android.compatibility.common.tradefed.targetprep.VtsFilePusher">
         <option name="push-group" value="IfaceFuzzerTest.push"/>
     </target_preparer>
diff --git a/config/vr/V1_0/func_fuzzer/AndroidTest.xml b/config/vr/V1_0/func_fuzzer/AndroidTest.xml
index 2477cb1..e61d638 100644
--- a/config/vr/V1_0/func_fuzzer/AndroidTest.xml
+++ b/config/vr/V1_0/func_fuzzer/AndroidTest.xml
@@ -3,6 +3,7 @@
      Do not edit manually.
 -->
 <configuration description="Config for VtsHalVrV1_0FuncFuzzer test cases">
+    <option name="config-descriptor:metadata" key="plan" value="vts-misc" />
     <target_preparer class="com.android.compatibility.common.tradefed.targetprep.VtsFilePusher">
         <option name="push-group" value="FuncFuzzerTest.push"/>
     </target_preparer>
diff --git a/config/vr/V1_0/iface_fuzzer/AndroidTest.xml b/config/vr/V1_0/iface_fuzzer/AndroidTest.xml
index 5148d35..93e7e45 100644
--- a/config/vr/V1_0/iface_fuzzer/AndroidTest.xml
+++ b/config/vr/V1_0/iface_fuzzer/AndroidTest.xml
@@ -3,6 +3,7 @@
      Do not edit manually.
 -->
 <configuration description="Config for VtsHalVrV1_0IfaceFuzzer test cases">
+    <option name="config-descriptor:metadata" key="plan" value="vts-fuzz" />
     <target_preparer class="com.android.compatibility.common.tradefed.targetprep.VtsFilePusher">
         <option name="push-group" value="IfaceFuzzerTest.push"/>
     </target_preparer>
diff --git a/config/wifi/V1_0/func_fuzzer/AndroidTest.xml b/config/wifi/V1_0/func_fuzzer/AndroidTest.xml
index 47286e9..6543951 100644
--- a/config/wifi/V1_0/func_fuzzer/AndroidTest.xml
+++ b/config/wifi/V1_0/func_fuzzer/AndroidTest.xml
@@ -3,6 +3,7 @@
      Do not edit manually.
 -->
 <configuration description="Config for VtsHalWifiV1_0FuncFuzzer test cases">
+    <option name="config-descriptor:metadata" key="plan" value="vts-misc" />
     <target_preparer class="com.android.compatibility.common.tradefed.targetprep.VtsFilePusher">
         <option name="push-group" value="FuncFuzzerTest.push"/>
     </target_preparer>
diff --git a/config/wifi/V1_0/iface_fuzzer/AndroidTest.xml b/config/wifi/V1_0/iface_fuzzer/AndroidTest.xml
index b83f7b9..8519fc5 100644
--- a/config/wifi/V1_0/iface_fuzzer/AndroidTest.xml
+++ b/config/wifi/V1_0/iface_fuzzer/AndroidTest.xml
@@ -3,6 +3,7 @@
      Do not edit manually.
 -->
 <configuration description="Config for VtsHalWifiV1_0IfaceFuzzer test cases">
+    <option name="config-descriptor:metadata" key="plan" value="vts-fuzz" />
     <target_preparer class="com.android.compatibility.common.tradefed.targetprep.VtsFilePusher">
         <option name="push-group" value="IfaceFuzzerTest.push"/>
     </target_preparer>
diff --git a/config/wifi/supplicant/V1_0/func_fuzzer/AndroidTest.xml b/config/wifi/supplicant/V1_0/func_fuzzer/AndroidTest.xml
index 7daf017..7de26af 100644
--- a/config/wifi/supplicant/V1_0/func_fuzzer/AndroidTest.xml
+++ b/config/wifi/supplicant/V1_0/func_fuzzer/AndroidTest.xml
@@ -3,6 +3,7 @@
      Do not edit manually.
 -->
 <configuration description="Config for VtsHalWifiSupplicantV1_0FuncFuzzer test cases">
+    <option name="config-descriptor:metadata" key="plan" value="vts-misc" />
     <target_preparer class="com.android.compatibility.common.tradefed.targetprep.VtsFilePusher">
         <option name="push-group" value="FuncFuzzerTest.push"/>
     </target_preparer>
diff --git a/config/wifi/supplicant/V1_0/iface_fuzzer/AndroidTest.xml b/config/wifi/supplicant/V1_0/iface_fuzzer/AndroidTest.xml
index 337d7e7..957a2ae 100644
--- a/config/wifi/supplicant/V1_0/iface_fuzzer/AndroidTest.xml
+++ b/config/wifi/supplicant/V1_0/iface_fuzzer/AndroidTest.xml
@@ -3,6 +3,7 @@
      Do not edit manually.
 -->
 <configuration description="Config for VtsHalWifiSupplicantV1_0IfaceFuzzer test cases">
+    <option name="config-descriptor:metadata" key="plan" value="vts-staging-fuzz" />
     <target_preparer class="com.android.compatibility.common.tradefed.targetprep.VtsFilePusher">
         <option name="push-group" value="IfaceFuzzerTest.push"/>
     </target_preparer>