diff --git a/device-oriole.mk b/device-oriole.mk
index e7d0373..5e5470b 100644
--- a/device-oriole.mk
+++ b/device-oriole.mk
@@ -172,7 +172,9 @@ PRODUCT_PACKAGES += \
 
 # SKU specific RROs
 PRODUCT_PACKAGES += \
-    SettingsOverlayGR1YH
+    SettingsOverlayGR1YH \
+    SettingsOverlayGB7N6 \
+    SettingsOverlayG9S9B
 
 # Fingerprint antispoof property
 PRODUCT_PRODUCT_PROPERTIES +=\
diff --git a/oriole/overlay_packages/SettingsOverlayG9S9B/Android.bp b/oriole/overlay_packages/SettingsOverlayG9S9B/Android.bp
new file mode 100644
index 0000000..ec184e7
--- /dev/null
+++ b/oriole/overlay_packages/SettingsOverlayG9S9B/Android.bp
@@ -0,0 +1,8 @@
+package {
+    default_applicable_licenses: ["Android-Apache-2.0"],
+}
+
+runtime_resource_overlay {
+    name: "SettingsOverlayG9S9B",
+    product_specific: true,
+}
diff --git a/oriole/overlay_packages/SettingsOverlayG9S9B/AndroidManifest.xml b/oriole/overlay_packages/SettingsOverlayG9S9B/AndroidManifest.xml
new file mode 100644
index 0000000..eedae8e
--- /dev/null
+++ b/oriole/overlay_packages/SettingsOverlayG9S9B/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.g9s9b">
+    <application android:hasCode="false" />
+    <overlay android:targetPackage="com.android.settings"
+             android:requiredSystemPropertyName="ro.boot.hardware.sku"
+             android:requiredSystemPropertyValue="G9S9B"
+             android:isStatic="true" />
+</manifest>
diff --git a/oriole/overlay_packages/SettingsOverlayG9S9B/res/drawable/regulatory_info.png b/oriole/overlay_packages/SettingsOverlayG9S9B/res/drawable/regulatory_info.png
new file mode 100644
index 0000000..f95e25a
Binary files /dev/null and b/oriole/overlay_packages/SettingsOverlayG9S9B/res/drawable/regulatory_info.png differ
diff --git a/oriole/overlay_packages/SettingsOverlayGB7N6/Android.bp b/oriole/overlay_packages/SettingsOverlayGB7N6/Android.bp
new file mode 100644
index 0000000..f6ccc34
--- /dev/null
+++ b/oriole/overlay_packages/SettingsOverlayGB7N6/Android.bp
@@ -0,0 +1,8 @@
+package {
+    default_applicable_licenses: ["Android-Apache-2.0"],
+}
+
+runtime_resource_overlay {
+    name: "SettingsOverlayGB7N6",
+    product_specific: true,
+}
diff --git a/oriole/overlay_packages/SettingsOverlayGB7N6/AndroidManifest.xml b/oriole/overlay_packages/SettingsOverlayGB7N6/AndroidManifest.xml
new file mode 100644
index 0000000..dcb3216
--- /dev/null
+++ b/oriole/overlay_packages/SettingsOverlayGB7N6/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.gb7n6">
+    <application android:hasCode="false" />
+    <overlay android:targetPackage="com.android.settings"
+             android:requiredSystemPropertyName="ro.boot.hardware.sku"
+             android:requiredSystemPropertyValue="GB7N6"
+             android:isStatic="true" />
+</manifest>
diff --git a/oriole/overlay_packages/SettingsOverlayGB7N6/res/drawable/regulatory_info.png b/oriole/overlay_packages/SettingsOverlayGB7N6/res/drawable/regulatory_info.png
new file mode 100644
index 0000000..54420e6
Binary files /dev/null and b/oriole/overlay_packages/SettingsOverlayGB7N6/res/drawable/regulatory_info.png differ
diff --git a/oriole/overlay_packages/SettingsOverlayGR1YH/res/drawable/regulatory_info.png b/oriole/overlay_packages/SettingsOverlayGR1YH/res/drawable/regulatory_info.png
index 2e6a7c4..5bd13be 100644
Binary files a/oriole/overlay_packages/SettingsOverlayGR1YH/res/drawable/regulatory_info.png and b/oriole/overlay_packages/SettingsOverlayGR1YH/res/drawable/regulatory_info.png differ