diff --git a/Android.bp b/Android.bp
index 60a4abd..54160b7 100644
--- a/Android.bp
+++ b/Android.bp
@@ -34,6 +34,8 @@
         "com.android.compos",
         "com.android.virt",
     ],
+    product_available: true,
+    vendor_available: true,
 }
 
 rust_test {
diff --git a/TEST_MAPPING b/TEST_MAPPING
index 078d2ff..84f8e99 100644
--- a/TEST_MAPPING
+++ b/TEST_MAPPING
@@ -1,19 +1,21 @@
 // Generated by update_crate_tests.py for tests that depend on this crate.
 {
+  "imports": [
+    {
+      "path": "packages/modules/Virtualization/virtualizationmanager"
+    },
+    {
+      "path": "packages/modules/Virtualization/vm"
+    }
+  ],
   "presubmit": [
     {
       "name": "shared_child_test_src_lib"
-    },
-    {
-      "name": "virtualizationservice_device_test"
     }
   ],
   "presubmit-rust": [
     {
       "name": "shared_child_test_src_lib"
-    },
-    {
-      "name": "virtualizationservice_device_test"
     }
   ]
 }