diff --git a/compatibility_matrices/exclude/fcm_exclude.cpp b/compatibility_matrices/exclude/fcm_exclude.cpp
index 7a6ea2b..50653a1 100644
--- a/compatibility_matrices/exclude/fcm_exclude.cpp
+++ b/compatibility_matrices/exclude/fcm_exclude.cpp
@@ -33,12 +33,12 @@
     };
 
     static std::vector<std::string> excluded_prefixes{
-            // TODO(b/110261831): reduce items in this list
-            "android.hardware.gnss.measurement_corrections@",
+            // Packages without top level interfaces (including types-only packages) are exempted.
+            "android.hardware.camera.device@",
+            "android.hardware.gnss.measurement_corrections@1.",
             "android.hardware.graphics.bufferqueue@",
 
-            // Exempted.
-            "android.hardware.camera.device@",
+            // Test packages are exempted.
             "android.hardware.tests.",
     };
 
@@ -46,20 +46,21 @@
             // TODO(b/110261831): reduce items in this list
             "android.hardware.audio@7.0",
             "android.hardware.audio.effect@7.0",
-            "android.hardware.biometrics.fingerprint@2.3",
-            "android.hardware.cas.native@1.0",
             "android.hardware.fastboot@1.0",
-            "android.hardware.gnss.visibility_control@1.0",
             "android.hardware.media.bufferpool@1.0",
             "android.hardware.media.bufferpool@2.0",
-            "android.hardware.radio.config@1.2",
             "android.hardware.tv.cec@2.0",
             "android.hardware.tv.tuner@1.0",
-            "android.hardware.keymaster",
 
-            // Exempted
+            // Packages without top level interfaces (including types-only packages) are exempted.
+            // HIDL
+            "android.hardware.cas.native@1.0",
+            "android.hardware.gnss.visibility_control@1.0",
+            "android.hardware.radio.config@1.2",
+            // AIDL
             "android.hardware.common",
             "android.hardware.graphics.common",
+            "android.hardware.keymaster",
     };
 
     auto package_has_prefix = [&](const std::string& prefix) {