diff --git a/device-oriole.mk b/device-oriole.mk
index b38f140..5e161ac 100644
--- a/device-oriole.mk
+++ b/device-oriole.mk
@@ -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..54cccdc 100644
--- a/device-raven.mk
+++ b/device-raven.mk
@@ -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)