diff --git a/device.mk b/device.mk
index 0ab012ae..217d1b66 100644
--- a/device.mk
+++ b/device.mk
@@ -503,10 +503,9 @@ PRODUCT_PACKAGES += \
 # WideVine modules
 PRODUCT_PACKAGES += \
 	android.hardware.drm-service.clearkey \
-	android.hardware.drm-service.widevine \
 	liboemcrypto \
 
-
+include vendor/widevine/libwvdrmengine/apex/device/device.mk
 
 $(call soong_config_set,google3a_config,soc,gs101)
 $(call soong_config_set,google3a_config,gcam_awb,true)
diff --git a/rro_overlays/WifiOverlay/res/values/config.xml b/rro_overlays/WifiOverlay/res/values/config.xml
index 4addce85..2b878db1 100644
--- a/rro_overlays/WifiOverlay/res/values/config.xml
+++ b/rro_overlays/WifiOverlay/res/values/config.xml
@@ -144,4 +144,8 @@
 
     <!-- Enable WPA2 to WPA3 auto-upgrade offload to capable Driver/Firmware -->
     <bool translatable="false" name="config_wifiSaeUpgradeOffloadEnabled">true</bool>
+
+    <!-- Boolean indicating whether DTIM multiplier configuration is enabled. DTIM multiplier value
+        is when the system is in the suspended mode -->
+    <bool translatable="false" name="config_wifiDtimMultiplierConfigEnabled">true</bool>
 </resources>