diff --git a/device-raven.mk b/device-raven.mk
index 2a689af..7410c30 100644
--- a/device-raven.mk
+++ b/device-raven.mk
@@ -109,7 +109,10 @@ PRODUCT_COPY_FILES += \
 PRODUCT_DEFAULT_PROPERTY_OVERRIDES += vendor.display.lbe.supported=1
 
 # PowerStats HAL
-PRODUCT_SOONG_NAMESPACES += device/google/raviole/powerstats/raven
+PRODUCT_SOONG_NAMESPACES += \
+    device/google/raviole/powerstats/raven \
+    device/google/raviole
+
 
 # userdebug specific
 ifneq (,$(filter userdebug eng, $(TARGET_BUILD_VARIANT)))
@@ -137,3 +140,7 @@ PRODUCT_PRODUCT_PROPERTIES += ro.com.google.ime.kb_pad_port_l=11
 # DCK properties based on target
 PRODUCT_PROPERTY_OVERRIDES += \
     ro.gms.dck.eligible_wcc=3
+
+# SKU specific RROs
+PRODUCT_PACKAGES += \
+    SettingsOverlayGF5KQ
\ No newline at end of file
diff --git a/raven/overlay_packages/SettingsOverlayGF5KQ/Android.bp b/raven/overlay_packages/SettingsOverlayGF5KQ/Android.bp
new file mode 100644
index 0000000..5c5ddd5
--- /dev/null
+++ b/raven/overlay_packages/SettingsOverlayGF5KQ/Android.bp
@@ -0,0 +1,8 @@
+package {
+    default_applicable_licenses: ["Android-Apache-2.0"],
+}
+
+runtime_resource_overlay {
+    name: "SettingsOverlayGF5KQ",
+    product_specific: true,
+}
diff --git a/raven/overlay_packages/SettingsOverlayGF5KQ/AndroidManifest.xml b/raven/overlay_packages/SettingsOverlayGF5KQ/AndroidManifest.xml
new file mode 100644
index 0000000..8827290
--- /dev/null
+++ b/raven/overlay_packages/SettingsOverlayGF5KQ/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.gf5kq">
+    <application android:hasCode="false" />
+    <overlay android:targetPackage="com.android.settings"
+             android:requiredSystemPropertyName="ro.boot.hardware.sku"
+             android:requiredSystemPropertyValue="GF5KQ"
+             android:isStatic="true" />
+</manifest>
\ No newline at end of file
diff --git a/raven/overlay_packages/SettingsOverlayGF5KQ/res/drawable/regulatory_info.png b/raven/overlay_packages/SettingsOverlayGF5KQ/res/drawable/regulatory_info.png
new file mode 100644
index 0000000..5c5e12f
Binary files /dev/null and b/raven/overlay_packages/SettingsOverlayGF5KQ/res/drawable/regulatory_info.png differ