diff --git a/cheetah/overlay_packages/SettingsOverlayGFE4J/Android.bp b/cheetah/overlay_packages/SettingsOverlayGFE4J/Android.bp
new file mode 100644
index 0000000..6703cbd
--- /dev/null
+++ b/cheetah/overlay_packages/SettingsOverlayGFE4J/Android.bp
@@ -0,0 +1,8 @@
+package {
+    default_applicable_licenses: ["Android-Apache-2.0"],
+}
+
+runtime_resource_overlay {
+    name: "SettingsOverlayGFE4J",
+    product_specific: true,
+}
diff --git a/cheetah/overlay_packages/SettingsOverlayGFE4J/AndroidManifest.xml b/cheetah/overlay_packages/SettingsOverlayGFE4J/AndroidManifest.xml
new file mode 100644
index 0000000..3d2e649
--- /dev/null
+++ b/cheetah/overlay_packages/SettingsOverlayGFE4J/AndroidManifest.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+    package="com.android.settings.overlay.gfe4j">
+    <application android:hasCode="false" />
+    <overlay android:targetPackage="com.android.settings"
+             android:requiredSystemPropertyName="ro.boot.hardware.sku"
+             android:requiredSystemPropertyValue="GFE4J"
+             android:isStatic="true" />
+</manifest>
diff --git a/cheetah/overlay_packages/SettingsOverlayGFE4J/res/drawable/regulatory_info.png b/cheetah/overlay_packages/SettingsOverlayGFE4J/res/drawable/regulatory_info.png
new file mode 100644
index 0000000..72ce864
Binary files /dev/null and b/cheetah/overlay_packages/SettingsOverlayGFE4J/res/drawable/regulatory_info.png differ
diff --git a/device-cheetah.mk b/device-cheetah.mk
index 478c67d..3cf1854 100644
--- a/device-cheetah.mk
+++ b/device-cheetah.mk
@@ -165,8 +165,8 @@ PRODUCT_PROPERTY_OVERRIDES += \
 
 # PowerStats HAL
 PRODUCT_SOONG_NAMESPACES += \
-    device/google/pantah/powerstats/cheetah
-
+    device/google/pantah/powerstats/cheetah \
+    device/google/pantah
 
 # Fingerprint HAL
 GOODIX_CONFIG_BUILD_VERSION := g7_trusty
@@ -212,3 +212,7 @@ PRODUCT_PRODUCT_PROPERTIES += \
 PRODUCT_PACKAGES += \
     NoCutoutOverlay \
     AvoidAppsInCutoutOverlay
+
+# SKU specific RROs
+PRODUCT_PACKAGES += \
+    SettingsOverlayGFE4J
diff --git a/device-panther.mk b/device-panther.mk
index 0527a54..cc07c2e 100644
--- a/device-panther.mk
+++ b/device-panther.mk
@@ -154,7 +154,8 @@ PRODUCT_PROPERTY_OVERRIDES += \
 
 # PowerStats HAL
 PRODUCT_SOONG_NAMESPACES += \
-    device/google/pantah/powerstats/panther
+    device/google/pantah/powerstats/panther \
+    device/google/pantah
 
 # Fingerprint HAL
 GOODIX_CONFIG_BUILD_VERSION := g7_trusty
@@ -203,3 +204,7 @@ PRODUCT_PRODUCT_PROPERTIES += \
 PRODUCT_PACKAGES += \
     NoCutoutOverlay \
     AvoidAppsInCutoutOverlay
+
+# SKU specific RROs
+PRODUCT_PACKAGES += \
+    SettingsOverlayG03Z5
diff --git a/panther/overlay_packages/SettingsOverlayG03Z5/Android.bp b/panther/overlay_packages/SettingsOverlayG03Z5/Android.bp
new file mode 100644
index 0000000..ecf67b5
--- /dev/null
+++ b/panther/overlay_packages/SettingsOverlayG03Z5/Android.bp
@@ -0,0 +1,8 @@
+package {
+    default_applicable_licenses: ["Android-Apache-2.0"],
+}
+
+runtime_resource_overlay {
+    name: "SettingsOverlayG03Z5",
+    product_specific: true,
+}
diff --git a/panther/overlay_packages/SettingsOverlayG03Z5/AndroidManifest.xml b/panther/overlay_packages/SettingsOverlayG03Z5/AndroidManifest.xml
new file mode 100644
index 0000000..5a85508
--- /dev/null
+++ b/panther/overlay_packages/SettingsOverlayG03Z5/AndroidManifest.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+    package="com.android.settings.overlay.g03z5">
+    <application android:hasCode="false" />
+    <overlay android:targetPackage="com.android.settings"
+             android:requiredSystemPropertyName="ro.boot.hardware.sku"
+             android:requiredSystemPropertyValue="G03Z5"
+             android:isStatic="true" />
+</manifest>
diff --git a/panther/overlay_packages/SettingsOverlayG03Z5/res/drawable/regulatory_info.png b/panther/overlay_packages/SettingsOverlayG03Z5/res/drawable/regulatory_info.png
new file mode 100644
index 0000000..0b3a1f5
Binary files /dev/null and b/panther/overlay_packages/SettingsOverlayG03Z5/res/drawable/regulatory_info.png differ