diff --git a/BoardConfig-common.mk b/BoardConfig-common.mk
index 60cbdd75..4e34ea20 100644
--- a/BoardConfig-common.mk
+++ b/BoardConfig-common.mk
@@ -381,6 +381,9 @@ BOARD_BUILD_VENDOR_RAMDISK_IMAGE := true
 KERNEL_MODULE_DIR := $(TARGET_KERNEL_DIR)
 KERNEL_MODULES := $(wildcard $(KERNEL_MODULE_DIR)/*.ko)
 
+ifneq ($(wildcard $(KERNEL_MODULE_DIR)/system_dlkm.modules.blocklist),)
+BOARD_SYSTEM_KERNEL_MODULES_BLOCKLIST_FILE := $(KERNEL_MODULE_DIR)/system_dlkm.modules.blocklist
+endif
 BOARD_VENDOR_KERNEL_MODULES_BLOCKLIST_FILE := $(KERNEL_MODULE_DIR)/vendor_dlkm.modules.blocklist
 
 # Prebuilt kernel modules that are *not* listed in vendor_kernel_boot.modules.load
@@ -412,6 +415,12 @@ else
 BOARD_VENDOR_KERNEL_MODULES := $(KERNEL_MODULES)
 endif
 
+BOARD_SYSTEM_KERNEL_MODULES_LOAD := $(strip $(shell cat $(KERNEL_MODULE_DIR)/system_dlkm.modules.load))
+ifndef BOARD_SYSTEM_KERNEL_MODULES_LOAD
+$(warning system_dlkm.modules.load not found or empty)
+endif
+BOARD_SYSTEM_KERNEL_MODULES := $(addprefix $(KERNEL_MODULE_DIR)/, $(notdir $(BOARD_SYSTEM_KERNEL_MODULES_LOAD)))
+
 # Using BUILD_COPY_HEADERS
 BUILD_BROKEN_USES_BUILD_COPY_HEADERS := true
 
diff --git a/device_framework_matrix_product.xml b/device_framework_matrix_product.xml
index e598cb86..9d626258 100644
--- a/device_framework_matrix_product.xml
+++ b/device_framework_matrix_product.xml
@@ -142,14 +142,6 @@
             <instance>sced0</instance>
         </interface>
     </hal>
-    <hal format="aidl" optional="true">
-        <name>com.google.pixel.modem.logmasklibrary</name>
-        <version>1</version>
-        <interface>
-            <name>ILiboemserviceProxy</name>
-            <instance>default</instance>
-        </interface>
-    </hal>
     <hal format="hidl" optional="true">
         <name>vendor.samsung_slsi.telephony.hardware.radioExternal</name>
         <version>1.1</version>
diff --git a/powerstats/Gs201CommonDataProviders.cpp b/powerstats/Gs201CommonDataProviders.cpp
index d6f1af58..2b1f5618 100644
--- a/powerstats/Gs201CommonDataProviders.cpp
+++ b/powerstats/Gs201CommonDataProviders.cpp
@@ -19,6 +19,7 @@
 #include <AdaptiveDvfsStateResidencyDataProvider.h>
 #include <AocTimedStateResidencyDataProvider.h>
 #include <DevfreqStateResidencyDataProvider.h>
+#include <DisplayMrrStateResidencyDataProvider.h>
 #include <DvfsStateResidencyDataProvider.h>
 #include <UfsStateResidencyDataProvider.h>
 #include <dataproviders/GenericStateResidencyDataProvider.h>
@@ -37,6 +38,7 @@
 using aidl::android::hardware::power::stats::AdaptiveDvfsStateResidencyDataProvider;
 using aidl::android::hardware::power::stats::AocTimedStateResidencyDataProvider;
 using aidl::android::hardware::power::stats::DevfreqStateResidencyDataProvider;
+using aidl::android::hardware::power::stats::DisplayMrrStateResidencyDataProvider;
 using aidl::android::hardware::power::stats::DvfsStateResidencyDataProvider;
 using aidl::android::hardware::power::stats::UfsStateResidencyDataProvider;
 using aidl::android::hardware::power::stats::EnergyConsumerType;
@@ -608,6 +610,15 @@ void addCamera(std::shared_ptr<PowerStats> p) {
             {"VSYS_PWR_CAM"}));
 }
 
+void addDisplayMrrByEntity(std::shared_ptr<PowerStats> p, std::string name, std::string path) {
+    p->addStateResidencyDataProvider(std::make_unique<DisplayMrrStateResidencyDataProvider>(
+            name, path));
+}
+
+void addDisplayMrr(std::shared_ptr<PowerStats> p) {
+    addDisplayMrrByEntity(p, "Display", "/sys/class/drm/card0/device/primary-panel/");
+}
+
 void addGs201CommonDataProviders(std::shared_ptr<PowerStats> p) {
     setEnergyMeter(p);
 
diff --git a/powerstats/include/Gs201CommonDataProviders.h b/powerstats/include/Gs201CommonDataProviders.h
index 97a70668..6cc81361 100644
--- a/powerstats/include/Gs201CommonDataProviders.h
+++ b/powerstats/include/Gs201CommonDataProviders.h
@@ -24,6 +24,8 @@ void addAoC(std::shared_ptr<PowerStats> p);
 void addCPUclusters(std::shared_ptr<PowerStats> p);
 void addCamera(std::shared_ptr<PowerStats> p);
 void addDevfreq(std::shared_ptr<PowerStats> p);
+void addDisplayMrr(std::shared_ptr<PowerStats> p);
+void addDisplayMrrByEntity(std::shared_ptr<PowerStats> p, std::string name, std::string path);
 void addDvfsStats(std::shared_ptr<PowerStats> p);
 void addGNSS(std::shared_ptr<PowerStats> p);
 void addGs201CommonDataProviders(std::shared_ptr<PowerStats> p);