diff --git a/conf/init.gs201.rc b/conf/init.gs201.rc
index 7dd788bc..b2129bc6 100644
--- a/conf/init.gs201.rc
+++ b/conf/init.gs201.rc
@@ -860,8 +860,11 @@ on post-fs-data
 
 # ODPM
 on fs
-    chown system system /sys/devices/platform/acpm_mfd_bus@18100000/i2c-7/i2c-s2mpg12mfd/s2mpg12-meter/s2mpg12-odpm/iio\:device0/enabled_rails
-    chown system system /sys/devices/platform/acpm_mfd_bus@18110000/i2c-8/i2c-s2mpg13mfd/s2mpg13-meter/s2mpg13-odpm/iio\:device1/enabled_rails
+    chown system system /sys/devices/platform/acpm_mfd_bus@17500000/i2c-6/6-001f/s2mpg10-meter/s2mpg10-odpm/iio:device0/enabled_rails
+    chown system system /sys/devices/platform/acpm_mfd_bus@17510000/i2c-7/7-002f/s2mpg11-meter/s2mpg11-odpm/iio:device1/enabled_rails
+
+    chown system system /sys/devices/platform/acpm_mfd_bus@17500000/i2c-7/7-001f/s2mpg10-meter/s2mpg10-odpm/iio:device0/enabled_rails
+    chown system system /sys/devices/platform/acpm_mfd_bus@17510000/i2c-8/8-002f/s2mpg11-meter/s2mpg11-odpm/iio:device1/enabled_rails
 
 on property:vendor.thermal.link_ready=1
     # BCL
diff --git a/device.mk b/device.mk
index 80a9ec91..2f9147d7 100644
--- a/device.mk
+++ b/device.mk
@@ -120,9 +120,29 @@ PRODUCT_PRODUCT_PROPERTIES += \
 PRODUCT_PRODUCT_PROPERTIES += \
 	persist.vendor.ril.camp_on_earlier=1
 
-# Hearing Aid Audio Support Using Bluetooth LE
+# Set supported Bluetooth profiles to enabled
 PRODUCT_PRODUCT_PROPERTIES += \
-	bluetooth.profile.asha.central.enabled=true
+	bluetooth.profile.asha.central.enabled=true \
+	bluetooth.profile.a2dp.source.enabled=true \
+	bluetooth.profile.avrcp.target.enabled=true \
+	bluetooth.profile.bap.broadcast.assist.enabled=true \
+	bluetooth.profile.bap.unicast.server.enabled=true \
+	bluetooth.profile.bas.client.enabled=true \
+	bluetooth.profile.csip.set_coordinator.enabled=true \
+	bluetooth.profile.gatt.enabled=true \
+	bluetooth.profile.hap.client.enabled=true \
+	bluetooth.profile.hfp.ag.enabled=true \
+	bluetooth.profile.hid.device.enabled=true \
+	bluetooth.profile.hid.host.enabled=true \
+	bluetooth.profile.map.server.enabled=true \
+	bluetooth.profile.mcp.server.enabled=true \
+	bluetooth.profile.opp.enabled=true \
+	bluetooth.profile.pan.nap.enabled=true \
+	bluetooth.profile.pan.panu.enabled=true \
+	bluetooth.profile.pbap.server.enabled=true \
+	bluetooth.profile.sap.server.enabled=true \
+	bluetooth.profile.tbs.server.enabled=true \
+	bluetooth.profile.vc.server.enabled=true
 
 # Carrier configuration default location
 PRODUCT_PROPERTY_OVERRIDES += \
diff --git a/display/display_colordata_cal0.pb b/display/display_colordata_cal0.pb
index 9e73287c..01843f14 100644
Binary files a/display/display_colordata_cal0.pb and b/display/display_colordata_cal0.pb differ