diff --git a/audio/oriole/tuning/waves/waves_preset.mps b/audio/oriole/tuning/waves/waves_preset.mps
index d7e406b..7b82c8e 100644
Binary files a/audio/oriole/tuning/waves/waves_preset.mps and b/audio/oriole/tuning/waves/waves_preset.mps differ
diff --git a/audio/raven/tuning/waves/waves_preset.mps b/audio/raven/tuning/waves/waves_preset.mps
index e490713..f29b7df 100644
Binary files a/audio/raven/tuning/waves/waves_preset.mps and b/audio/raven/tuning/waves/waves_preset.mps differ
diff --git a/device-oriole.mk b/device-oriole.mk
index e8e1bca..4443e6e 100644
--- a/device-oriole.mk
+++ b/device-oriole.mk
@@ -90,7 +90,9 @@ PRODUCT_COPY_FILES += \
 	device/google/raviole/tts/es-es/es-es-x-multi-r23.zvoice:product/tts/google/es-es/es-es-x-multi-r23.zvoice
 
 # PowerStats HAL
-PRODUCT_SOONG_NAMESPACES += device/google/raviole/powerstats/oriole
+PRODUCT_SOONG_NAMESPACES += \
+    device/google/raviole/powerstats/oriole \
+    device/google/raviole
 
 # Keyboard bottom padding in dp for portrait mode
 PRODUCT_PRODUCT_PROPERTIES += ro.com.google.ime.kb_pad_port_b=10
@@ -112,3 +114,7 @@ PRODUCT_VENDOR_PROPERTIES += \
 PRODUCT_PACKAGES += \
     NoCutoutOverlay \
     AvoidAppsInCutoutOverlay
+
+# SKU specific RROs
+PRODUCT_PACKAGES += \
+    SettingsOverlayGR1YH
diff --git a/init.insmod.oriole.cfg b/init.insmod.oriole.cfg
index 43faf93..8d7ce06 100644
--- a/init.insmod.oriole.cfg
+++ b/init.insmod.oriole.cfg
@@ -6,7 +6,7 @@
 
 # Load device specific kernel modules
 # Modules here will be loaded *after* all common modules
-insmod|/vendor/lib/modules/bcmdhd4389.ko
+modprobe|bcmdhd4389.ko
 modprobe|ftm5.ko
 modprobe|sec_touch.ko
 
diff --git a/init.insmod.raven.cfg b/init.insmod.raven.cfg
index a4a0e35..cdbf3f7 100644
--- a/init.insmod.raven.cfg
+++ b/init.insmod.raven.cfg
@@ -6,7 +6,7 @@
 
 # Load device specific kernel modules
 # Modules here will be loaded *after* all common modules
-insmod|/vendor/lib/modules/bcmdhd4389.ko
+modprobe|bcmdhd4389.ko
 modprobe|sec_touch.ko
 
 # All device specific modules loaded
diff --git a/init.insmod.slider.cfg b/init.insmod.slider.cfg
index 4c2c5d3..a877273 100644
--- a/init.insmod.slider.cfg
+++ b/init.insmod.slider.cfg
@@ -6,13 +6,13 @@
 
 # Load device specific kernel modules
 # Modules here will be loaded *after* all common modules
-insmod|/vendor/lib/modules/bcmdhd43752.ko
-insmod|/vendor/lib/modules/bcmdhd4389.ko
-insmod|/vendor/lib/modules/snd-soc-cs35l41-spi.ko
-insmod|/vendor/lib/modules/ftm5.ko
-insmod|/vendor/lib/modules/haptics-cs40l2x.ko
-insmod|/vendor/lib/modules/st33spi.ko
-insmod|/vendor/lib/modules/st54spi.ko
+modprobe|bcmdhd43752.ko
+modprobe|bcmdhd4389.ko
+modprobe|snd-soc-cs35l41-spi.ko
+modprobe|ftm5.ko
+modprobe|haptics-cs40l2x.ko
+modprobe|st33spi.ko
+modprobe|st54spi.ko
 
 # Wait for any asynchronous work to complete
 wait|/sys/class/leds/vibrator
diff --git a/init.insmod.whitefin.cfg b/init.insmod.whitefin.cfg
index 4f63434..aa49c61 100644
--- a/init.insmod.whitefin.cfg
+++ b/init.insmod.whitefin.cfg
@@ -6,10 +6,10 @@
 
 # Load device specific kernel modules
 # Modules here will be loaded *after* all common modules
-insmod|/vendor/lib/modules/bcmdhd43752.ko
-insmod|/vendor/lib/modules/snd-soc-cs35l41-i2c.ko
-insmod|/vendor/lib/modules/drv2624.ko
-insmod|/vendor/lib/modules/sec_touch.ko
+modprobe|bcmdhd43752.ko
+modprobe|snd-soc-cs35l41-i2c.ko
+modprobe|drv2624.ko
+modprobe|sec_touch.ko
 
 # All device specific modules loaded
 setprop|vendor.device.modules.ready
diff --git a/oriole/overlay_packages/SettingsOverlayGR1YH/Android.bp b/oriole/overlay_packages/SettingsOverlayGR1YH/Android.bp
new file mode 100644
index 0000000..736ec56
--- /dev/null
+++ b/oriole/overlay_packages/SettingsOverlayGR1YH/Android.bp
@@ -0,0 +1,8 @@
+package {
+    default_applicable_licenses: ["Android-Apache-2.0"],
+}
+
+runtime_resource_overlay {
+    name: "SettingsOverlayGR1YH",
+    product_specific: true,
+}
diff --git a/oriole/overlay_packages/SettingsOverlayGR1YH/AndroidManifest.xml b/oriole/overlay_packages/SettingsOverlayGR1YH/AndroidManifest.xml
new file mode 100644
index 0000000..6ba2577
--- /dev/null
+++ b/oriole/overlay_packages/SettingsOverlayGR1YH/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.gr1yh">
+    <application android:hasCode="false" />
+    <overlay android:targetPackage="com.android.settings"
+             android:requiredSystemPropertyName="ro.boot.hardware.sku"
+             android:requiredSystemPropertyValue="GR1YH"
+             android:isStatic="true" />
+</manifest>
\ No newline at end of file
diff --git a/oriole/overlay_packages/SettingsOverlayGR1YH/res/drawable/regulatory_info.png b/oriole/overlay_packages/SettingsOverlayGR1YH/res/drawable/regulatory_info.png
new file mode 100644
index 0000000..67fb97b
Binary files /dev/null and b/oriole/overlay_packages/SettingsOverlayGR1YH/res/drawable/regulatory_info.png differ