diff --git a/Moto/Razr/Android.mk b/Moto/Razr/Android.mk
new file mode 100644
index 0000000..dab92b9
--- /dev/null
+++ b/Moto/Razr/Android.mk
@@ -0,0 +1,8 @@
+LOCAL_PATH := $(call my-dir)
+include $(CLEAR_VARS)
+LOCAL_MODULE_TAGS := optional
+LOCAL_PACKAGE_NAME := treble-overlay-moto-razr
+LOCAL_MODULE_PATH := $(TARGET_OUT_PRODUCT)/overlay
+LOCAL_IS_RUNTIME_RESOURCE_OVERLAY := true
+LOCAL_PRIVATE_PLATFORM_APIS := true
+include $(BUILD_PACKAGE)
diff --git a/Moto/Razr/AndroidManifest.xml b/Moto/Razr/AndroidManifest.xml
new file mode 100644
index 0000000..4bba264
--- /dev/null
+++ b/Moto/Razr/AndroidManifest.xml
@@ -0,0 +1,14 @@
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+        package="me.phh.treble.overlay.moto.razr"
+        android:versionCode="1"
+        android:versionName="1.0">
+	<!--
+		TESTS: Ignore ro.vendor.product.name
+                Avoid issues with modified vendors
+	-->
+        <overlay android:targetPackage="android"
+                android:requiredSystemPropertyName="ro.vendor.product.name"
+                android:requiredSystemPropertyValue="+*olson_retail"
+		android:priority="213"
+		android:isStatic="true" />
+</manifest>
diff --git a/Moto/Razr/res/values/config.xml b/Moto/Razr/res/values/config.xml
new file mode 100644
index 0000000..e3e8660
--- /dev/null
+++ b/Moto/Razr/res/values/config.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <bool name="config_powerDecoupleAutoSuspendModeFromDisplay">true</bool>
+    <bool name="config_dozeAlwaysOnDisplayAvailable">true</bool>
+    <bool name="config_displayBlanksAfterDoze">true</bool>
+    <bool name="config_dozeAfterScreenOffByDefault">true</bool>
+    <integer name="config_screenBrightnessDoze">3</integer>
+</resources>
diff --git a/overlay.mk b/overlay.mk
index fb7a977..9986045 100755
--- a/overlay.mk
+++ b/overlay.mk
@@ -66,6 +66,7 @@ PRODUCT_PACKAGES += \
 	treble-overlay-moto-one \
 	treble-overlay-moto-one-action \
 	treble-overlay-moto-onehyper \
+	treble-overlay-moto-razr \
 	treble-overlay-mtk-ims \
 	treble-overlay-nokia-b2n-7plus \
 	treble-overlay-nokia-ctl-7-1 \