diff --git a/device-redfin.mk b/device-redfin.mk
index 76c8e8e..6d6d43a 100644
--- a/device-redfin.mk
+++ b/device-redfin.mk
@@ -239,5 +239,8 @@ PRODUCT_PACKAGES += \
 PRODUCT_PROPERTY_OVERRIDES += \
     renderthread.skia.reduceopstasksplitting=true
 
-# Include the redfin product FCM
+# Include the redfin product FCM.
+# Vendor Freeze system-only builds use a different FCM.
+ifneq ($(PRODUCT_VENDOR_FREEZE_SYSTEM_BUILD),true)
 PRODUCT_PACKAGES += redfin_product_compatibility_matrix.xml
+endif
diff --git a/device_framework_matrix_product.xml b/device_framework_matrix_product.xml
index 742d1ff..f3fcd07 100644
--- a/device_framework_matrix_product.xml
+++ b/device_framework_matrix_product.xml
@@ -1,5 +1,5 @@
-<compatibility-matrix version="1.0" type="framework" level="6">
-    <hal format="hidl" optional="false">
+<compatibility-matrix version="1.0" type="framework" level="5">
+    <hal format="hidl" optional="true">
         <name>vendor.google.wireless_charger</name>
         <version>1.3</version>
         <interface>