diff --git a/device-oriole.mk b/device-oriole.mk
index b38f140..c087157 100644
--- a/device-oriole.mk
+++ b/device-oriole.mk
@@ -163,7 +163,7 @@ PRODUCT_PACKAGES += \
 SHARED_MODEM_PLATFORM_VENDOR := lassen
 
 # Shared Modem Platform
-include device/google/gs-common/modem/shared_modem_platform/shared_modem_platform.mk
+include device/google/gs-common/modem/modem_svc_sit/shared_modem_platform.mk
 
 # SecureElement
 PRODUCT_PACKAGES += \
@@ -364,3 +364,8 @@ ifneq (,$(filter userdebug eng, $(TARGET_BUILD_VARIANT)))
 $(call inherit-product-if-exists, device/google/common/etm/device-userdebug-modules.mk)
 endif
 endif
+
+# PlayVideos
+PLAYVIDEOS_VERSION_DIR := 4.20.6
+$(call soong_config_set_bool,playvideos,use_device_specific_version,true)
+PRODUCT_SOONG_NAMESPACES += vendor/unbundled_google/packages/PlayVideos/$(PLAYVIDEOS_VERSION_DIR)
diff --git a/device-raven.mk b/device-raven.mk
index 49ff1e0..6833ea4 100644
--- a/device-raven.mk
+++ b/device-raven.mk
@@ -168,7 +168,7 @@ PRODUCT_PACKAGES += \
 SHARED_MODEM_PLATFORM_VENDOR := lassen
 
 # Shared Modem Platform
-include device/google/gs-common/modem/shared_modem_platform/shared_modem_platform.mk
+include device/google/gs-common/modem/modem_svc_sit/shared_modem_platform.mk
 
 # SecureElement
 PRODUCT_PACKAGES += \
@@ -373,3 +373,8 @@ ifneq (,$(filter userdebug eng, $(TARGET_BUILD_VARIANT)))
 $(call inherit-product-if-exists, device/google/common/etm/device-userdebug-modules.mk)
 endif
 endif
+
+# PlayVideos
+PLAYVIDEOS_VERSION_DIR := 4.20.6
+$(call soong_config_set_bool,playvideos,use_device_specific_version,true)
+PRODUCT_SOONG_NAMESPACES += vendor/unbundled_google/packages/PlayVideos/$(PLAYVIDEOS_VERSION_DIR)
diff --git a/device-slider.mk b/device-slider.mk
index f47ab65..dbbeda3 100644
--- a/device-slider.mk
+++ b/device-slider.mk
@@ -99,7 +99,7 @@ PRODUCT_PACKAGES += \
 SHARED_MODEM_PLATFORM_VENDOR := lassen
 
 # Shared Modem Platform
-include device/google/gs-common/modem/shared_modem_platform/shared_modem_platform.mk
+include device/google/gs-common/modem/modem_svc_sit/shared_modem_platform.mk
 
 # SecureElement
 PRODUCT_PACKAGES += \
diff --git a/device-whitefin.mk b/device-whitefin.mk
index 41a969c..4f51022 100644
--- a/device-whitefin.mk
+++ b/device-whitefin.mk
@@ -95,7 +95,7 @@ PRODUCT_PACKAGES += \
 SHARED_MODEM_PLATFORM_VENDOR := lassen
 
 # Shared Modem Platform
-include device/google/gs-common/modem/shared_modem_platform/shared_modem_platform.mk
+include device/google/gs-common/modem/modem_svc_sit/shared_modem_platform.mk
 
 # PowerStats HAL
 PRODUCT_SOONG_NAMESPACES += device/google/raviole/powerstats/whitefin