diff --git a/device-tangorpro.mk b/device-tangorpro.mk
index b91be17..ab9c028 100644
--- a/device-tangorpro.mk
+++ b/device-tangorpro.mk
@@ -36,6 +36,7 @@ DISABLE_CAMERA_FS_AF := true
 include device/google/tangorpro/audio/tangorpro/audio-tables.mk
 include device/google/gs201/device-shipping-common.mk
 
+DEVICE_PRODUCT_COMPATIBILITY_MATRIX_FILE += device/google/tangorpro/device_framework_matrix_product.xml
 $(call soong_config_set,lyric,tuning_product,cloudripper)
 $(call soong_config_set,google3a_config,target_device,cloudripper)
 
diff --git a/device_framework_matrix_product.xml b/device_framework_matrix_product.xml
new file mode 100644
index 0000000..c0f208c
--- /dev/null
+++ b/device_framework_matrix_product.xml
@@ -0,0 +1,11 @@
+<compatibility-matrix version="1.0" type="framework" level="7">
+    <hal format="hidl">
+        <name>hardware.google.bluetooth.ccc</name>
+        <version>1.1</version>
+        <interface>
+            <name>IBluetoothCcc</name>
+            <instance>default</instance>
+        </interface>
+    </hal>
+</compatibility-matrix>
+
diff --git a/powerstats/service.cpp b/powerstats/service.cpp
index 32515ee..67415a4 100644
--- a/powerstats/service.cpp
+++ b/powerstats/service.cpp
@@ -35,11 +35,8 @@ void addDisplay(std::shared_ptr<PowerStats> p) {
     // Add display residency stats
     std::vector<std::string> states = {
         "Off",
-        "LP: 1080x2340@30",
-        "On: 1080x2340@60",
-        "On: 1080x2340@90",
-        "HBM: 1080x2340@60",
-        "HBM: 1080x2340@90"};
+        "On: 1600x2560@60",
+        "HBM: 1600x2560@60"};
 
     p->addStateResidencyDataProvider(std::make_unique<DisplayStateResidencyDataProvider>("Display",
             "/sys/class/backlight/panel0-backlight/state",
@@ -52,9 +49,7 @@ void addDisplay(std::shared_ptr<PowerStats> p) {
      */
     p->addEnergyConsumer(PowerStatsEnergyConsumer::createMeterAndEntityConsumer(p,
             EnergyConsumerType::DISPLAY, "display", {"PPVAR_VSYS_PWR_DISP"}, "Display",
-            {{"LP: 1080x2340@30", 1},
-             {"On: 1080x2340@60", 2},
-             {"On: 1080x2340@90", 3}}));
+            {{"On: 1600x2560@60", 1}}));
 }
 
 int main() {