diff --git a/bluetooth_power_limits_US.csv b/bluetooth_power_limits_US.csv
new file mode 100644
index 0000000..23a83dc
--- /dev/null
+++ b/bluetooth_power_limits_US.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,76,68,76,76,68,76,64,52,76,64,52,76
+off,off,off,off,on,on,76,68,76,76,68,76,64,52,76,64,52,76
+off,off,off,on,off,on,76,68,76,76,68,76,64,52,76,64,52,76
+off,off,off,on,on,on,76,68,76,76,68,76,64,52,76,64,52,76
+off,off,on,off,off,on,76,68,76,76,68,76,64,52,76,64,52,76
+off,off,on,off,on,on,76,68,76,76,68,76,64,52,76,64,52,76
+off,off,on,on,off,on,76,68,76,76,68,76,64,52,76,64,52,76
+off,off,on,on,on,on,76,68,76,76,68,76,64,52,76,64,52,76
+off,on,off,off,off,on,76,68,76,76,68,76,64,52,76,64,52,76
+off,on,off,off,on,on,76,68,76,76,68,76,64,52,76,64,52,76
+off,on,off,on,off,on,76,68,76,76,68,76,64,52,76,64,52,76
+off,on,off,on,on,on,76,68,76,76,68,76,64,52,76,64,52,76
+off,on,on,off,off,on,76,68,76,76,68,76,64,52,76,64,52,76
+off,on,on,off,on,on,76,68,76,76,68,76,64,52,76,64,52,76
+off,on,on,on,off,on,76,68,76,76,68,76,64,52,76,64,52,76
+off,on,on,on,on,on,76,68,76,76,68,76,64,52,76,64,52,76
+on,off,off,off,off,any,76,68,76,76,68,76,64,52,76,64,52,76
+on,off,off,off,on,any,76,68,76,76,68,76,64,52,76,64,52,76
+on,off,off,on,off,any,76,68,76,76,68,76,64,52,76,64,52,76
+on,off,off,on,on,any,76,68,76,76,68,76,64,52,76,64,52,76
+on,off,on,off,off,any,76,68,76,76,68,76,64,52,76,64,52,76
+on,off,on,off,on,any,76,68,76,76,68,76,64,52,76,64,52,76
+on,off,on,on,off,any,44,44,44,44,44,44,44,44,56,44,44,56
+on,off,on,on,on,any,44,44,44,44,44,44,44,44,56,44,44,56
+on,on,off,off,off,any,44,44,44,44,44,44,44,44,56,44,44,56
+on,on,off,off,on,any,44,44,44,44,44,44,44,44,56,44,44,56
+on,on,off,on,off,any,44,44,44,44,44,44,44,44,56,44,44,56
+on,on,off,on,on,any,44,44,44,44,44,44,44,44,56,44,44,56
+on,on,on,off,off,any,44,44,44,44,44,44,44,44,56,44,44,56
+on,on,on,off,on,any,44,44,44,44,44,44,44,44,56,44,44,56
+on,on,on,on,off,any,44,44,44,44,44,44,44,44,56,44,44,56
+on,on,on,on,on,any,44,44,44,44,44,44,44,44,56,44,44,56
+off,any,any,any,any,off,76,68,76,76,68,76,64,52,76,64,52,76
\ No newline at end of file
diff --git a/device-raven.mk b/device-raven.mk
index 139f7fa..fdcd63e 100644
--- a/device-raven.mk
+++ b/device-raven.mk
@@ -68,7 +68,8 @@ 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_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
 
 # Bluetooth SAR test tool
 PRODUCT_PACKAGES_DEBUG += \
diff --git a/oriole/overlay/frameworks/base/core/res/res/xml/power_profile.xml b/oriole/overlay/frameworks/base/core/res/res/xml/power_profile.xml
index c867689..c95c57f 100644
--- a/oriole/overlay/frameworks/base/core/res/res/xml/power_profile.xml
+++ b/oriole/overlay/frameworks/base/core/res/res/xml/power_profile.xml
@@ -17,6 +17,8 @@
 */
 -->
 <device name="Android">
+    <!-- All values are in mA except as noted -->
+    <item name="battery.capacity">4614</item>
     <!-- Number of cores each CPU cluster contains -->
     <array name="cpu.clusters.cores">
       <value>4</value> <!-- Cluster 0 has 4 cores (cpu0, cpu1, cpu2, cpu3) -->
diff --git a/oriole/overlay_packages/SettingsOverlayGR1YH/res/drawable/regulatory_info.png b/oriole/overlay_packages/SettingsOverlayGR1YH/res/drawable/regulatory_info.png
index 67fb97b..2e6a7c4 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/core/res/res/xml/power_profile.xml b/raven/overlay/frameworks/base/core/res/res/xml/power_profile.xml
index c867689..a7cec2d 100644
--- a/raven/overlay/frameworks/base/core/res/res/xml/power_profile.xml
+++ b/raven/overlay/frameworks/base/core/res/res/xml/power_profile.xml
@@ -17,6 +17,8 @@
 */
 -->
 <device name="Android">
+    <!-- All values are in mA except as noted -->
+    <item name="battery.capacity">5003</item>
     <!-- Number of cores each CPU cluster contains -->
     <array name="cpu.clusters.cores">
       <value>4</value> <!-- Cluster 0 has 4 cores (cpu0, cpu1, cpu2, cpu3) -->
diff --git a/thermal_info_config_oriole.json b/thermal_info_config_oriole.json
index 58ac51e..9d2491d 100644
--- a/thermal_info_config_oriole.json
+++ b/thermal_info_config_oriole.json
@@ -703,7 +703,7 @@
                 "NAN",
                 "NAN",
                 "NAN",
-                1200,
+                1150,
                 "NAN",
                 "NAN"
             ],
@@ -719,7 +719,7 @@
                 "NAN",
                 "NAN",
                 "NAN",
-                1200,
+                1350,
                 "NAN",
                 "NAN"
             ],
diff --git a/thermal_info_config_oriole_WHI_A.json b/thermal_info_config_oriole_WHI_A.json
index 1f9c264..4b4f17d 100644
--- a/thermal_info_config_oriole_WHI_A.json
+++ b/thermal_info_config_oriole_WHI_A.json
@@ -392,7 +392,7 @@
                 "NAN",
                 "NAN",
                 "NAN",
-                1200,
+                1150,
                 "NAN",
                 "NAN"
             ],
@@ -408,7 +408,7 @@
                 "NAN",
                 "NAN",
                 "NAN",
-                1200,
+                1350,
                 "NAN",
                 "NAN"
             ],
diff --git a/thermal_info_config_raven.json b/thermal_info_config_raven.json
index 2e05f0f..2c16a2c 100644
--- a/thermal_info_config_raven.json
+++ b/thermal_info_config_raven.json
@@ -703,7 +703,7 @@
                 "NAN",
                 "NAN",
                 "NAN",
-                1200,
+                1150,
                 "NAN",
                 "NAN"
             ],
@@ -719,7 +719,7 @@
                 "NAN",
                 "NAN",
                 "NAN",
-                1200,
+                1350,
                 "NAN",
                 "NAN"
             ],