diff --git a/bluetooth_power_limits_raven.csv b/bluetooth_power_limits_raven.csv
index 0f4196b..eeed54f 100644
--- a/bluetooth_power_limits_raven.csv
+++ b/bluetooth_power_limits_raven.csv
@@ -1,34 +1,34 @@
 Head,BTHotspot,WIFI5Ghz,HotspotVoice,Cell,IMU,BDR_Single_Chain_0,EDR_Single_Chain_0,BLE_Single_Chain_0,BDR_Single_Chain_1,EDR_Single_Chain_1,BLE_Single_Chain_1,BDR_Dual_Chain_0,EDR_Dual_Chain_0,BLE_Dual_Chain_0,BDR_Dual_Chain_1,EDR_Dual_Chain_1,BLE_Dual_Chain_1
-off,off,off,off,off,on,60,60,44,60,60,44,48,48,44,48,48,44
-off,off,off,off,on,on,60,60,44,60,60,44,48,48,44,48,48,44
-off,off,off,on,off,on,60,60,44,60,60,44,48,48,44,48,48,44
-off,off,off,on,on,on,60,60,44,60,60,44,48,48,44,48,48,44
-off,off,on,off,off,on,60,60,44,60,60,44,48,48,44,48,48,44
-off,off,on,off,on,on,60,60,44,60,60,44,48,48,44,48,48,44
-off,off,on,on,off,on,60,60,44,60,60,44,48,48,44,48,48,44
-off,off,on,on,on,on,60,60,44,60,60,44,48,48,44,48,48,44
-off,on,off,off,off,on,60,60,44,60,60,44,48,48,44,48,48,44
-off,on,off,off,on,on,60,60,44,60,60,44,48,48,44,48,48,44
-off,on,off,on,off,on,60,60,44,60,60,44,48,48,44,48,48,44
-off,on,off,on,on,on,60,60,44,60,60,44,48,48,44,48,48,44
-off,on,on,off,off,on,60,60,44,60,60,44,48,48,44,48,48,44
-off,on,on,off,on,on,60,60,44,60,60,44,48,48,44,48,48,44
-off,on,on,on,off,on,60,60,44,60,60,44,48,48,44,48,48,44
-off,on,on,on,on,on,60,60,44,60,60,44,48,48,44,48,48,44
-on,off,off,off,off,any,60,60,44,60,60,44,48,48,44,48,48,44
-on,off,off,off,on,any,60,60,44,60,60,44,48,48,44,48,48,44
-on,off,off,on,off,any,60,60,44,60,60,44,48,48,44,48,48,44
-on,off,off,on,on,any,60,60,44,60,60,44,48,48,44,48,48,44
-on,off,on,off,off,any,60,60,44,60,60,44,48,48,44,48,48,44
-on,off,on,off,on,any,60,60,44,60,60,44,48,48,44,48,48,44
-on,off,on,on,off,any,60,60,44,60,60,44,48,48,44,48,48,44
-on,off,on,on,on,any,60,60,44,60,60,44,48,48,44,48,48,44
-on,on,off,off,off,any,60,60,44,60,60,44,48,48,44,48,48,44
-on,on,off,off,on,any,60,60,44,60,60,44,48,48,44,48,48,44
-on,on,off,on,off,any,60,60,44,60,60,44,48,48,44,48,48,44
-on,on,off,on,on,any,60,60,44,60,60,44,48,48,44,48,48,44
-on,on,on,off,off,any,60,60,44,60,60,44,48,48,44,48,48,44
-on,on,on,off,on,any,60,60,44,60,60,44,48,48,44,48,48,44
-on,on,on,on,off,any,60,60,44,60,60,44,48,48,44,48,48,44
-on,on,on,on,on,any,60,60,44,60,60,44,48,48,44,48,48,44
-off,any,any,any,any,off,60,60,44,60,60,44,48,48,44,48,48,44
+off,off,off,off,off,on,68,64,40,68,64,40,52,52,40,52,52,40
+off,off,off,off,on,on,68,64,40,68,64,40,52,52,40,52,52,40
+off,off,off,on,off,on,68,64,40,68,64,40,52,52,40,52,52,40
+off,off,off,on,on,on,68,64,40,68,64,40,52,52,40,52,52,40
+off,off,on,off,off,on,68,64,40,68,64,40,52,52,40,52,52,40
+off,off,on,off,on,on,68,64,40,68,64,40,52,52,40,52,52,40
+off,off,on,on,off,on,68,64,40,68,64,40,52,52,40,52,52,40
+off,off,on,on,on,on,68,64,40,68,64,40,52,52,40,52,52,40
+off,on,off,off,off,on,68,64,40,68,64,40,52,52,40,52,52,40
+off,on,off,off,on,on,68,64,40,68,64,40,52,52,40,52,52,40
+off,on,off,on,off,on,68,64,40,68,64,40,52,52,40,52,52,40
+off,on,off,on,on,on,68,64,40,68,64,40,52,52,40,52,52,40
+off,on,on,off,off,on,68,64,40,68,64,40,52,52,40,52,52,40
+off,on,on,off,on,on,68,64,40,68,64,40,52,52,40,52,52,40
+off,on,on,on,off,on,68,64,40,68,64,40,52,52,40,52,52,40
+off,on,on,on,on,on,68,64,40,68,64,40,52,52,40,52,52,40
+on,off,off,off,off,any,68,64,40,68,64,40,52,52,40,52,52,40
+on,off,off,off,on,any,68,64,40,68,64,40,52,52,40,52,52,40
+on,off,off,on,off,any,68,64,40,68,64,40,52,52,40,52,52,40
+on,off,off,on,on,any,68,64,40,68,64,40,52,52,40,52,52,40
+on,off,on,off,off,any,68,64,40,68,64,40,52,52,40,52,52,40
+on,off,on,off,on,any,68,64,40,68,64,40,52,52,40,52,52,40
+on,off,on,on,off,any,44,44,40,44,44,40,44,44,40,44,44,40
+on,off,on,on,on,any,44,44,40,44,44,40,44,44,40,44,44,40
+on,on,off,off,off,any,44,44,40,44,44,40,44,44,40,44,44,40
+on,on,off,off,on,any,44,44,40,44,44,40,44,44,40,44,44,40
+on,on,off,on,off,any,44,44,40,44,44,40,44,44,40,44,44,40
+on,on,off,on,on,any,44,44,40,44,44,40,44,44,40,44,44,40
+on,on,on,off,off,any,44,44,40,44,44,40,44,44,40,44,44,40
+on,on,on,off,on,any,44,44,40,44,44,40,44,44,40,44,44,40
+on,on,on,on,off,any,44,44,40,44,44,40,44,44,40,44,44,40
+on,on,on,on,on,any,44,44,40,44,44,40,44,44,40,44,44,40
+off,any,any,any,any,off,68,64,40,68,64,40,52,56,40,52,56,40
\ No newline at end of file
diff --git a/bluetooth_power_limits_EU.csv b/bluetooth_power_limits_raven_eu.csv
similarity index 100%
rename from bluetooth_power_limits_EU.csv
rename to bluetooth_power_limits_raven_eu.csv
diff --git a/bluetooth_power_limits_raven_jp.csv b/bluetooth_power_limits_raven_jp.csv
new file mode 100644
index 0000000..f87f85b
--- /dev/null
+++ b/bluetooth_power_limits_raven_jp.csv
@@ -0,0 +1,34 @@
+Head,BTHotspot,WIFI5Ghz,HotspotVoice,Cell,IMU,BDR_Single_Chain_0,EDR_Single_Chain_0,BLE_Single_Chain_0,BDR_Single_Chain_1,EDR_Single_Chain_1,BLE_Single_Chain_1,BDR_Dual_Chain_0,EDR_Dual_Chain_0,BLE_Dual_Chain_0,BDR_Dual_Chain_1,EDR_Dual_Chain_1,BLE_Dual_Chain_1
+off,off,off,off,off,on,68,64,40,68,64,40,52,56,40,52,56,40
+off,off,off,off,on,on,68,64,40,68,64,40,52,56,40,52,56,40
+off,off,off,on,off,on,68,64,40,68,64,40,52,56,40,52,56,40
+off,off,off,on,on,on,68,64,40,68,64,40,52,56,40,52,56,40
+off,off,on,off,off,on,68,64,40,68,64,40,52,56,40,52,56,40
+off,off,on,off,on,on,68,64,40,68,64,40,52,56,40,52,56,40
+off,off,on,on,off,on,68,64,40,68,64,40,52,56,40,52,56,40
+off,off,on,on,on,on,68,64,40,68,64,40,52,56,40,52,56,40
+off,on,off,off,off,on,68,64,40,68,64,40,52,56,40,52,56,40
+off,on,off,off,on,on,68,64,40,68,64,40,52,56,40,52,56,40
+off,on,off,on,off,on,68,64,40,68,64,40,52,56,40,52,56,40
+off,on,off,on,on,on,68,64,40,68,64,40,52,56,40,52,56,40
+off,on,on,off,off,on,68,64,40,68,64,40,52,56,40,52,56,40
+off,on,on,off,on,on,68,64,40,68,64,40,52,56,40,52,56,40
+off,on,on,on,off,on,68,64,40,68,64,40,52,56,40,52,56,40
+off,on,on,on,on,on,68,64,40,68,64,40,52,56,40,52,56,40
+on,off,off,off,off,any,68,64,40,68,64,40,52,56,40,52,56,40
+on,off,off,off,on,any,68,64,40,68,64,40,52,56,40,52,56,40
+on,off,off,on,off,any,68,64,40,68,64,40,52,56,40,52,56,40
+on,off,off,on,on,any,68,64,40,68,64,40,52,56,40,52,56,40
+on,off,on,off,off,any,68,64,40,68,64,40,52,56,40,52,56,40
+on,off,on,off,on,any,68,64,40,68,64,40,52,56,40,52,56,40
+on,off,on,on,off,any,68,64,40,68,64,40,52,56,40,52,56,40
+on,off,on,on,on,any,68,64,40,68,64,40,52,56,40,52,56,40
+on,on,off,off,off,any,68,64,40,68,64,40,52,56,40,52,56,40
+on,on,off,off,on,any,68,64,40,68,64,40,52,56,40,52,56,40
+on,on,off,on,off,any,68,64,40,68,64,40,52,56,40,52,56,40
+on,on,off,on,on,any,68,64,40,68,64,40,52,56,40,52,56,40
+on,on,on,off,off,any,68,64,40,68,64,40,52,56,40,52,56,40
+on,on,on,off,on,any,68,64,40,68,64,40,52,56,40,52,56,40
+on,on,on,on,off,any,68,64,40,68,64,40,52,56,40,52,56,40
+on,on,on,on,on,any,68,64,40,68,64,40,52,56,40,52,56,40
+off,any,any,any,any,off,68,64,40,68,64,40,52,56,40,52,56,40
\ No newline at end of file
diff --git a/bluetooth_power_limits_US.csv b/bluetooth_power_limits_raven_us.csv
similarity index 100%
rename from bluetooth_power_limits_US.csv
rename to bluetooth_power_limits_raven_us.csv
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/device-raven.mk b/device-raven.mk
index 321c8d3..e68ac35 100644
--- a/device-raven.mk
+++ b/device-raven.mk
@@ -69,8 +69,10 @@ PRODUCT_PRODUCT_PROPERTIES += \
 # Bluetooth Tx power caps for raven
 PRODUCT_COPY_FILES += \
     $(LOCAL_PATH)/bluetooth_power_limits_raven.csv:$(TARGET_COPY_OUT_VENDOR)/etc/bluetooth_power_limits.csv \
-    $(LOCAL_PATH)/bluetooth_power_limits_US.csv:$(TARGET_COPY_OUT_VENDOR)/etc/bluetooth_power_limits_US.csv \
-    $(LOCAL_PATH)/bluetooth_power_limits_EU.csv:$(TARGET_COPY_OUT_VENDOR)/etc/bluetooth_power_limits_EU.csv
+    $(LOCAL_PATH)/bluetooth_power_limits_raven_us.csv:$(TARGET_COPY_OUT_VENDOR)/etc/bluetooth_power_limits_US.csv \
+    $(LOCAL_PATH)/bluetooth_power_limits_raven_eu.csv:$(TARGET_COPY_OUT_VENDOR)/etc/bluetooth_power_limits_EU.csv \
+    $(LOCAL_PATH)/bluetooth_power_limits_raven_jp.csv:$(TARGET_COPY_OUT_VENDOR)/etc/bluetooth_power_limits_JP.csv
+
 
 # Bluetooth SAR test tool
 PRODUCT_PACKAGES_DEBUG += \
@@ -184,7 +186,9 @@ PRODUCT_PROPERTY_OVERRIDES += \
 
 # SKU specific RROs
 PRODUCT_PACKAGES += \
-    SettingsOverlayGF5KQ
+    SettingsOverlayGF5KQ \
+    SettingsOverlayGLU0G \
+    SettingsOverlayG8V0U
 
 # Trusty liboemcrypto.so
 PRODUCT_SOONG_NAMESPACES += vendor/google_devices/raviole/prebuilts
diff --git a/oriole/overlay/frameworks/base/packages/SystemUI/res/values/dimens.xml b/oriole/overlay/frameworks/base/packages/SystemUI/res/values/dimens.xml
index 49b55f8..29363c6 100644
--- a/oriole/overlay/frameworks/base/packages/SystemUI/res/values/dimens.xml
+++ b/oriole/overlay/frameworks/base/packages/SystemUI/res/values/dimens.xml
@@ -34,7 +34,7 @@
     <dimen name="system_icons_super_container_avatarless_margin_end">26px</dimen>
 
     <!-- Margin on the right side of the system icon group on Keyguard. -->
-    <dimen name="system_icons_keyguard_padding_end">5dp</dimen>
+    <dimen name="system_icons_keyguard_padding_end">4.5dp</dimen>
 
     <dimen name="keyguard_carrier_text_margin">0px</dimen>
 
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
diff --git a/raven/overlay/frameworks/base/packages/SystemUI/res/values/dimens.xml b/raven/overlay/frameworks/base/packages/SystemUI/res/values/dimens.xml
index 6acdbcf..bd8bafa 100644
--- a/raven/overlay/frameworks/base/packages/SystemUI/res/values/dimens.xml
+++ b/raven/overlay/frameworks/base/packages/SystemUI/res/values/dimens.xml
@@ -31,7 +31,7 @@
     <dimen name="system_icons_super_container_avatarless_margin_end">26px</dimen>
 
     <!-- Margin on the right side of the system icon group on Keyguard. -->
-    <dimen name="system_icons_keyguard_padding_end">7dp</dimen>
+    <dimen name="system_icons_keyguard_padding_end">6.5dp</dimen>
 
     <!-- A path similar to frameworks/base/core/res/res/values/config.xml
         config_mainBuiltInDisplayCutout that describes a path larger than the exact path of a display
diff --git a/raven/overlay_packages/SettingsOverlayG8V0U/Android.bp b/raven/overlay_packages/SettingsOverlayG8V0U/Android.bp
new file mode 100644
index 0000000..5793034
--- /dev/null
+++ b/raven/overlay_packages/SettingsOverlayG8V0U/Android.bp
@@ -0,0 +1,8 @@
+package {
+    default_applicable_licenses: ["Android-Apache-2.0"],
+}
+
+runtime_resource_overlay {
+    name: "SettingsOverlayG8V0U",
+    product_specific: true,
+}
diff --git a/raven/overlay_packages/SettingsOverlayG8V0U/AndroidManifest.xml b/raven/overlay_packages/SettingsOverlayG8V0U/AndroidManifest.xml
new file mode 100644
index 0000000..3062338
--- /dev/null
+++ b/raven/overlay_packages/SettingsOverlayG8V0U/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.g8v0u">
+    <application android:hasCode="false" />
+    <overlay android:targetPackage="com.android.settings"
+             android:requiredSystemPropertyName="ro.boot.hardware.sku"
+             android:requiredSystemPropertyValue="G8V0U"
+             android:isStatic="true" />
+</manifest>
diff --git a/raven/overlay_packages/SettingsOverlayG8V0U/res/drawable/regulatory_info.png b/raven/overlay_packages/SettingsOverlayG8V0U/res/drawable/regulatory_info.png
new file mode 100644
index 0000000..1f14956
Binary files /dev/null and b/raven/overlay_packages/SettingsOverlayG8V0U/res/drawable/regulatory_info.png differ
diff --git a/raven/overlay_packages/SettingsOverlayGF5KQ/res/drawable/regulatory_info.png b/raven/overlay_packages/SettingsOverlayGF5KQ/res/drawable/regulatory_info.png
index 6112729..81f7df3 100644
Binary files a/raven/overlay_packages/SettingsOverlayGF5KQ/res/drawable/regulatory_info.png and b/raven/overlay_packages/SettingsOverlayGF5KQ/res/drawable/regulatory_info.png differ
diff --git a/raven/overlay_packages/SettingsOverlayGLU0G/Android.bp b/raven/overlay_packages/SettingsOverlayGLU0G/Android.bp
new file mode 100644
index 0000000..50b1256
--- /dev/null
+++ b/raven/overlay_packages/SettingsOverlayGLU0G/Android.bp
@@ -0,0 +1,8 @@
+package {
+    default_applicable_licenses: ["Android-Apache-2.0"],
+}
+
+runtime_resource_overlay {
+    name: "SettingsOverlayGLU0G",
+    product_specific: true,
+}
diff --git a/raven/overlay_packages/SettingsOverlayGLU0G/AndroidManifest.xml b/raven/overlay_packages/SettingsOverlayGLU0G/AndroidManifest.xml
new file mode 100644
index 0000000..0411c19
--- /dev/null
+++ b/raven/overlay_packages/SettingsOverlayGLU0G/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.glu0g">
+    <application android:hasCode="false" />
+    <overlay android:targetPackage="com.android.settings"
+             android:requiredSystemPropertyName="ro.boot.hardware.sku"
+             android:requiredSystemPropertyValue="GLU0G"
+             android:isStatic="true" />
+</manifest>
diff --git a/raven/overlay_packages/SettingsOverlayGLU0G/res/drawable/regulatory_info.png b/raven/overlay_packages/SettingsOverlayGLU0G/res/drawable/regulatory_info.png
new file mode 100644
index 0000000..e1d981a
Binary files /dev/null and b/raven/overlay_packages/SettingsOverlayGLU0G/res/drawable/regulatory_info.png differ