diff --git a/build/apex/Android.bp b/build/apex/Android.bp
index b0ecdde..0bff52e 100644
--- a/build/apex/Android.bp
+++ b/build/apex/Android.bp
@@ -45,12 +45,7 @@
 
     apps: [
         "android.system.virtualmachine.res",
-    ] + select(release_flag("RELEASE_AVF_SUPPORT_CUSTOM_VM_WITH_PARAVIRTUALIZED_DEVICES"), {
-        true: [
-            "VmTerminalApp",
-        ],
-        default: [],
-    }),
+    ],
 
     file_contexts: ":com.android.virt-file_contexts",
 
@@ -165,7 +160,12 @@
     ],
     apps: [
         "EmptyPayloadApp",
-    ],
+    ] + select(release_flag("RELEASE_AVF_SUPPORT_CUSTOM_VM_WITH_PARAVIRTUALIZED_DEVICES"), {
+        true: [
+            "VmTerminalApp",
+        ],
+        default: [],
+    }),
     androidManifest: select(release_flag("RELEASE_AVF_ENABLE_LLPVM_CHANGES"), {
         true: "AndroidManifest.xml",
         default: unset,