diff --git a/device-cheetah.mk b/device-cheetah.mk
index 4bfe74a..719ccd6 100644
--- a/device-cheetah.mk
+++ b/device-cheetah.mk
@@ -48,7 +48,6 @@ DEVICE_PACKAGE_OVERLAYS += device/google/pantah/cheetah/overlay
 
 include device/google/pantah/audio/cheetah/audio-tables.mk
 include device/google/gs201/device-shipping-common.mk
-include hardware/google/pixel/vibrator/cs40l26/device.mk
 include device/google/gs-common/bcmbt/bluetooth.mk
 include device/google/gs-common/touch/syna/syna0.mk
 
@@ -131,6 +130,9 @@ PRODUCT_PACKAGES += \
 	android.hardware.nfc-service.st \
 	NfcOverlayCheetah
 
+# modem_svc_sit daemon
+PRODUCT_PACKAGES += modem_svc_sit
+
 # SecureElement
 PRODUCT_PACKAGES += \
 	android.hardware.secure_element@1.2-service-gto \
diff --git a/device-cloudripper.mk b/device-cloudripper.mk
index 4896cda..527cb14 100644
--- a/device-cloudripper.mk
+++ b/device-cloudripper.mk
@@ -38,7 +38,6 @@ $(call inherit-product-if-exists, vendor/google_devices/pantah/proprietary/cloud
 
 include device/google/gs201/device-shipping-common.mk
 include device/google/pantah/audio/cloudripper/audio-tables.mk
-include hardware/google/pixel/vibrator/cs40l26/device.mk
 include device/google/gs-common/bcmbt/bluetooth.mk
 include device/google/gs-common/gps/brcm/cbd_gps.mk
 include device/google/gs-common/touch/syna/syna0.mk
@@ -80,6 +79,9 @@ PRODUCT_PACKAGES += \
 	Tag \
 	android.hardware.nfc-service.st
 
+# modem_svc_sit daemon
+PRODUCT_PACKAGES += modem_svc_sit
+
 # SecureElement
 PRODUCT_PACKAGES += \
 	android.hardware.secure_element@1.2-service-gto \
diff --git a/device-panther.mk b/device-panther.mk
index a50f2ea..f376135 100644
--- a/device-panther.mk
+++ b/device-panther.mk
@@ -46,7 +46,6 @@ DEVICE_PACKAGE_OVERLAYS += device/google/pantah/panther/overlay
 
 include device/google/pantah/audio/panther/audio-tables.mk
 include device/google/gs201/device-shipping-common.mk
-include hardware/google/pixel/vibrator/cs40l26/device.mk
 include device/google/gs-common/bcmbt/bluetooth.mk
 include device/google/gs-common/touch/focaltech/focaltech.mk
 
@@ -110,6 +109,9 @@ PRODUCT_PACKAGES += \
 	android.hardware.nfc-service.st \
 	NfcOverlayPanther
 
+# modem_svc_sit daemon
+PRODUCT_PACKAGES += modem_svc_sit
+
 # SecureElement
 PRODUCT_PACKAGES += \
 	android.hardware.secure_element@1.2-service-gto \
diff --git a/device-ravenclaw.mk b/device-ravenclaw.mk
index 115bdc7..86c1858 100644
--- a/device-ravenclaw.mk
+++ b/device-ravenclaw.mk
@@ -38,7 +38,6 @@ $(call inherit-product-if-exists, vendor/google_devices/pantah/proprietary/raven
 
 include device/google/gs201/device-shipping-common.mk
 include device/google/pantah/audio/ravenclaw/audio-tables.mk
-include hardware/google/pixel/vibrator/cs40l26/device.mk
 include device/google/gs-common/bcmbt/bluetooth.mk
 include device/google/gs-common/touch/lsi/lsi.mk
 
diff --git a/factory_ravenclaw.mk b/factory_ravenclaw.mk
index cd07164..0e2b679 100644
--- a/factory_ravenclaw.mk
+++ b/factory_ravenclaw.mk
@@ -29,3 +29,6 @@ PRODUCT_MANUFACTURER := Google
 # default BDADDR for EVB only
 PRODUCT_PROPERTY_OVERRIDES += \
 	ro.vendor.bluetooth.evb_bdaddr="22:22:22:33:44:55"
+
+# modem_svc_sit daemon
+PRODUCT_PACKAGES += modem_svc_sit