diff --git a/broadcastradio/aidl/default/Android.bp b/broadcastradio/aidl/default/Android.bp
index 1d1bef7..e95208c 100644
--- a/broadcastradio/aidl/default/Android.bp
+++ b/broadcastradio/aidl/default/Android.bp
@@ -62,7 +62,7 @@
 
 cc_library {
     name: "DefaultBroadcastRadioHal",
-    vendor: true,
+    vendor_available: true,
     export_include_dirs: ["."],
     defaults: [
         "BroadcastRadioHalDefaults",
@@ -76,7 +76,8 @@
 
 cc_fuzz {
     name: "android.hardware.broadcastradio-service.default_fuzzer",
-    vendor: true,
+    // TODO(b/307611931): avoid fuzzing on vendor until hermiticity issue is fixed
+    // vendor: true,
     defaults: [
         "BroadcastRadioHalDefaults",
         "service_fuzzer_defaults",