diff --git a/device-oriole.mk b/device-oriole.mk
index 4cfaba3..99cd6ea 100644
--- a/device-oriole.mk
+++ b/device-oriole.mk
@@ -64,6 +64,10 @@ PRODUCT_PRODUCT_PROPERTIES += \
 PRODUCT_COPY_FILES += \
     $(LOCAL_PATH)/bluetooth_power_limits_oriole.csv:$(TARGET_COPY_OUT_VENDOR)/etc/bluetooth_power_limits.csv
 
+# Bluetooth SAR test tool
+PRODUCT_PACKAGES_DEBUG += \
+    sar_test
+
 # MIPI Coex Configs
 PRODUCT_COPY_FILES += \
     device/google/raviole/radio/oriole_display_mipi_coex_table.csv:$(TARGET_COPY_OUT_VENDOR)/etc/modem/display_primary_mipi_coex_table.csv \
diff --git a/device-raven.mk b/device-raven.mk
index ebe8226..241ab91 100644
--- a/device-raven.mk
+++ b/device-raven.mk
@@ -70,6 +70,10 @@ PRODUCT_PRODUCT_PROPERTIES += \
 PRODUCT_COPY_FILES += \
     $(LOCAL_PATH)/bluetooth_power_limits_raven.csv:$(TARGET_COPY_OUT_VENDOR)/etc/bluetooth_power_limits.csv
 
+# Bluetooth SAR test tool
+PRODUCT_PACKAGES_DEBUG += \
+    sar_test
+
 # Camera
 PRODUCT_COPY_FILES += \
 	device/google/raviole/media_profiles_raven.xml:$(TARGET_COPY_OUT_VENDOR)/etc/media_profiles_V1_0.xml
diff --git a/thermal_info_config_oriole.json b/thermal_info_config_oriole.json
index bfcf177..e058a37 100644
--- a/thermal_info_config_oriole.json
+++ b/thermal_info_config_oriole.json
@@ -336,20 +336,25 @@
                     "LimitInfo": [0, 2, 3, 4, 4, 4, 4],
                     "BindedPowerRail": "POWER_FOR_CHARGING_THROTTLING",
                     "PowerThreshold": [500, 500, 500, 500, 0, 0, 0],
-                    "CdevFloorWithPowerLink": [0, 0, 0, 2, 4 ,4 ,4],
+                    "CdevFloorWithPowerLink": [0, 0, 1, 2, 4 ,4 ,4],
                     "ReleaseLogic": "RELEASE_TO_FLOOR",
                     "ThrottlingWithPowerLink":true
                 },
                 {
                     "CdevRequest": "dc_icl",
-                    "LimitInfo": [0, 1, 2, 3, 3, 3, 3]
+                    "LimitInfo": [0, 1, 2, 4, 4, 4, 4],
+                    "BindedPowerRail": "POWER_FOR_CHARGING_THROTTLING",
+                    "PowerThreshold": [500, 500, 500, 500, 0, 0, 0],
+                    "CdevFloorWithPowerLink": [0, 1, 2, 3, 4, 4, 4],
+                    "ReleaseLogic": "RELEASE_TO_FLOOR",
+                    "ThrottlingWithPowerLink":true
                 },
                 {
                     "CdevRequest": "wlc_fcc",
-                    "LimitInfo": [0, 1, 1, 4, 4, 4, 4],
+                    "LimitInfo": [0, 2, 2, 5, 5, 5, 5],
                     "BindedPowerRail": "POWER_FOR_CHARGING_THROTTLING",
                     "PowerThreshold": [500, 500, 500, 500, 0, 0, 0],
-                    "CdevFloorWithPowerLink": [0, 0, 0, 1, 4 ,4 ,4],
+                    "CdevFloorWithPowerLink": [0, 1, 1, 2, 5, 5, 5],
                     "ReleaseLogic": "RELEASE_TO_FLOOR",
                     "ThrottlingWithPowerLink":true
                 }
diff --git a/thermal_info_config_raven.json b/thermal_info_config_raven.json
index 1336c62..9cfd109 100644
--- a/thermal_info_config_raven.json
+++ b/thermal_info_config_raven.json
@@ -336,20 +336,25 @@
                     "LimitInfo": [0, 2, 3, 4, 4, 4, 4],
                     "BindedPowerRail": "POWER_FOR_CHARGING_THROTTLING",
                     "PowerThreshold": [500, 500, 500, 500, 500, 0, 0],
-                    "CdevFloorWithPowerLink": [0, 0, 0, 2, 3 ,4 ,4],
+                    "CdevFloorWithPowerLink": [0, 0, 1, 2, 3 ,4 ,4],
                     "ReleaseLogic": "RELEASE_TO_FLOOR",
                     "ThrottlingWithPowerLink":true
                 },
                 {
                     "CdevRequest": "dc_icl",
-                    "LimitInfo": [0, 1, 2, 3, 3, 3, 3]
+                    "LimitInfo": [0, 1, 2, 4, 4, 4, 4],
+                    "BindedPowerRail": "POWER_FOR_CHARGING_THROTTLING",
+                    "PowerThreshold": [500, 500, 500, 500, 500, 0, 0],
+                    "CdevFloorWithPowerLink": [0, 1, 2, 3, 4, 4, 4],
+                    "ReleaseLogic": "RELEASE_TO_FLOOR",
+                    "ThrottlingWithPowerLink":true
                 },
                 {
                     "CdevRequest": "wlc_fcc",
-                    "LimitInfo": [0, 1, 1, 2, 3, 3, 3],
+                    "LimitInfo": [0, 2, 2, 3, 4, 4, 4],
                     "BindedPowerRail": "POWER_FOR_CHARGING_THROTTLING",
                     "PowerThreshold": [500, 500, 500, 500, 500, 0, 0],
-                    "CdevFloorWithPowerLink": [0, 0, 0, 1, 2 ,3 ,3],
+                    "CdevFloorWithPowerLink": [0, 1, 1, 2, 3, 4, 4],
                     "ReleaseLogic": "RELEASE_TO_FLOOR",
                     "ThrottlingWithPowerLink":true
                 }