diff --git a/device-lineage.mk b/device-lineage.mk
index 8323d78..f8919b1 100644
--- a/device-lineage.mk
+++ b/device-lineage.mk
@@ -12,7 +12,8 @@ PRODUCT_PACKAGES += \
 
 # RRO
 PRODUCT_PACKAGES += \
-    GrilRadioCustomizableNoRadio
+    GrilRadioCustomizableNoRadio \
+    TangorproGMSOverlay
 
 # Build necessary packages for vendor
 
diff --git a/tangorpro/overlay_packages/TangorproGMSOverlay/Android.bp b/tangorpro/overlay_packages/TangorproGMSOverlay/Android.bp
new file mode 100644
index 0000000..556eae0
--- /dev/null
+++ b/tangorpro/overlay_packages/TangorproGMSOverlay/Android.bp
@@ -0,0 +1,8 @@
+package {
+    default_applicable_licenses: ["Android-Apache-2.0"],
+}
+
+runtime_resource_overlay {
+    name: "TangorproGMSOverlay",
+    product_specific: true,
+}
diff --git a/tangorpro/overlay_packages/TangorproGMSOverlay/AndroidManifest.xml b/tangorpro/overlay_packages/TangorproGMSOverlay/AndroidManifest.xml
new file mode 100644
index 0000000..d162c99
--- /dev/null
+++ b/tangorpro/overlay_packages/TangorproGMSOverlay/AndroidManifest.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+    package="com.google.android.overlay.tangorpro.gms">
+    <application android:extractNativeLibs="true" android:hasCode="false" />
+    <overlay android:targetPackage="android"
+             android:priority="1"
+             android:requiredSystemPropertyName="ro.com.google.gmsversion"
+             android:isStatic="true"
+             android:requiredSystemPropertyValue="*" />
+</manifest>
diff --git a/tangorpro/overlay_packages/TangorproGMSOverlay/res/values/config.xml b/tangorpro/overlay_packages/TangorproGMSOverlay/res/values/config.xml
new file mode 100644
index 0000000..a484206
--- /dev/null
+++ b/tangorpro/overlay_packages/TangorproGMSOverlay/res/values/config.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <!-- ComponentName of the default dream (Settings.Secure.DEFAULT_SCREENSAVER_COMPONENT) -->
+    <string name="config_dreamsDefaultComponent">com.google.assistant.hubui/com.google.assistant.hubui.dream.CuratedPhotoDreamService</string>
+
+    <!-- Package that provides the supervised user creation flow. This package must include an
+         activity with an intent filter for {@link UserManager.ACTION_CREATE_SUPERVISED_USER}.
+         When this resource is defined, an extra button in user settings screen will be shown
+         with a title defined in @*android:string/supervised_user_creation_label
+         and an icon defined in @*android:drawable/ic_add_supervised_user.
+         That button will fire an intent targeted for this package with the mentioned action.
+         When this resource is empty, that button will not be shown. -->
+    <string name="config_supervisedUserCreationPackage">com.google.android.gms</string>
+
+    <!-- ComponentNames of the dreams that we should hide -->
+    <string-array name="config_disabledDreamComponents">
+        <item>com.google.android.deskclock/com.android.deskclock.Screensaver</item>
+        <item>com.android.dreams.basic/.Colors</item>
+        <item>com.google.android.apps.photos/.daydream.PhotosDreamService</item>
+        <item>com.android.systemui/com.google.android.systemui.lowlightclock.LowLightClockDreamService</item>
+    </string-array>
+</resources>