diff --git a/default-permissions.xml b/default-permissions.xml
index 2641aa47..8a67c9bc 100644
--- a/default-permissions.xml
+++ b/default-permissions.xml
@@ -47,6 +47,8 @@
         <!-- Location -->
         <permission name="android.permission.ACCESS_FINE_LOCATION" fixed="false"/>
         <permission name="android.permission.ACCESS_BACKGROUND_LOCATION" fixed="false"/>
+        <!-- Battery Widget -->
+        <permission name="android.permission.BLUETOOTH_CONNECT" fixed="false"/>
     </exception>
 
     <exception package="com.google.android.apps.cbrsnetworkmonitor">
diff --git a/device.mk b/device.mk
index de31d006..acf73853 100644
--- a/device.mk
+++ b/device.mk
@@ -204,8 +204,8 @@ PRODUCT_COPY_FILES += \
 	frameworks/native/data/etc/android.hardware.vulkan.version-1_1.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.hardware.vulkan.version.xml \
 	frameworks/native/data/etc/android.hardware.vulkan.level-1.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.hardware.vulkan.level.xml \
 	frameworks/native/data/etc/android.hardware.vulkan.compute-0.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.hardware.vulkan.compute.xml \
-	frameworks/native/data/etc/android.software.vulkan.deqp.level-2021-03-01.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.software.vulkan.deqp.level.xml \
-	frameworks/native/data/etc/android.software.opengles.deqp.level-2021-03-01.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.software.opengles.deqp.level.xml
+	frameworks/native/data/etc/android.software.vulkan.deqp.level-2022-03-01.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.software.vulkan.deqp.level.xml \
+	frameworks/native/data/etc/android.software.opengles.deqp.level-2022-03-01.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.software.opengles.deqp.level.xml
 
 ifeq ($(USE_SWIFTSHADER),true)
 PRODUCT_VENDOR_PROPERTIES += \
diff --git a/device_framework_matrix_product.xml b/device_framework_matrix_product.xml
index c6490102..63ef09f5 100644
--- a/device_framework_matrix_product.xml
+++ b/device_framework_matrix_product.xml
@@ -178,6 +178,14 @@
             <instance>default</instance>
         </interface>
     </hal>
+    <hal format="hidl" optional="true">
+        <name>hardware.google.bluetooth.ewp</name>
+        <version>1.0</version>
+        <interface>
+            <name>IBluetoothEwp</name>
+            <instance>default</instance>
+        </interface>
+    </hal>
     <hal format="hidl" optional="true">
         <name>vendor.google.google_battery</name>
         <version>1.2</version>
diff --git a/dumpstate/Dumpstate.cpp b/dumpstate/Dumpstate.cpp
index 3556da56..2740484b 100644
--- a/dumpstate/Dumpstate.cpp
+++ b/dumpstate/Dumpstate.cpp
@@ -575,6 +575,10 @@ void Dumpstate::dumpTouchSection(int fd) {
         snprintf(cmd, sizeof(cmd), "%s/selftest/Short", focaltech_cmd_path);
         DumpFileToFd(fd, "Get Short Test", cmd);
 
+        // Get HeatMap(ms,ss)
+        snprintf(cmd, sizeof(cmd), "%s/selftest/Strength", focaltech_cmd_path);
+        DumpFileToFd(fd, "Get HeatMap(ms,ss)", cmd);
+
         // Disable: force touch active
         snprintf(cmd, sizeof(cmd), "echo 20 > %s/force_active", focaltech_cmd_path);
         RunCommandToFd(fd, "Disable Force Touch Active", {"/vendor/bin/sh", "-c", cmd});