diff --git a/Android.bp b/Android.bp
index 148adf4..682711d 100644
--- a/Android.bp
+++ b/Android.bp
@@ -122,6 +122,7 @@
 }
 
 // buildinfo.prop contains common properties for system/build.prop, like ro.build.version.*
+// TODO(b/322090587): merge this to gen_build_prop.py script.
 buildinfo_prop {
     name: "buildinfo.prop",
 
@@ -141,5 +142,5 @@
 
 product_config {
     name: "product_config",
-    visibility: ["//visibility:private"],
+    visibility: ["//device/google/cuttlefish/system_image"],
 }