diff --git a/device.mk b/device.mk
index a5046062..b3f9670f 100644
--- a/device.mk
+++ b/device.mk
@@ -76,6 +76,8 @@ PRODUCT_PROPERTY_OVERRIDES += log.tag.ShannonQNS-HC=DEBUG
 include device/google/gs101/modem/userdebug.mk
 endif
 
+include device/google/gs101/modem/user.mk
+
 ifneq (,$(filter userdebug eng, $(TARGET_BUILD_VARIANT)))
 # b/36703476: Set default log size to 1M
 PRODUCT_PROPERTY_OVERRIDES += \
diff --git a/modem/user.mk b/modem/user.mk
new file mode 100644
index 00000000..81f37736
--- /dev/null
+++ b/modem/user.mk
@@ -0,0 +1,2 @@
+PRODUCT_PACKAGES += dmd
+BOARD_VENDOR_SEPOLICY_DIRS += device/google/gs101-sepolicy/modem/user