diff --git a/conf/init.gs201.rc b/conf/init.gs201.rc
index 26078c2a..d0e3cead 100644
--- a/conf/init.gs201.rc
+++ b/conf/init.gs201.rc
@@ -651,6 +651,13 @@ on property:vendor.device.modules.ready=1
     chown system system /sys/devices/virtual/sec/tsp/cmd
     chown system system /sys/devices/virtual/sec/tsp/cmd_result
     chown system system /sys/devices/virtual/sec/tsp/status
+    chown system system /proc/goog_touch_interface/gti.0
+    chown system system /proc/goog_touch_interface/gti.0/ms_base
+    chown system system /proc/goog_touch_interface/gti.0/ms_diff
+    chown system system /proc/goog_touch_interface/gti.0/ms_raw
+    chown system system /proc/goog_touch_interface/gti.0/ss_base
+    chown system system /proc/goog_touch_interface/gti.0/ss_diff
+    chown system system /proc/goog_touch_interface/gti.0/ss_raw
     # Allow access to touch
     chown system input /dev/touch_offload
     chmod 660 /dev/touch_offload
diff --git a/dumpstate/Dumpstate.cpp b/dumpstate/Dumpstate.cpp
index 0296991f..59fc01bc 100644
--- a/dumpstate/Dumpstate.cpp
+++ b/dumpstate/Dumpstate.cpp
@@ -536,6 +536,7 @@ void Dumpstate::dumpTouchSection(int fd) {
     const char syna_cmd_path[] = "/sys/class/spi_master/spi0/spi0.0/synaptics_tcm.0/sysfs";
     const char focaltech_cmd_path[] = "/proc/focaltech_touch";
     const char gti0_cmd_path[] = "/sys/devices/virtual/goog_touch_interface/gti.0";
+    const char gti0_procfs_path[] = "/proc/goog_touch_interface/gti.0";
     char cmd[256];
 
     if (!access(focaltech_cmd_path, R_OK)) {
@@ -867,6 +868,10 @@ void Dumpstate::dumpTouchSection(int fd) {
     }
 
     if (!access(gti0_cmd_path, R_OK)) {
+        const char *heatmap_path = gti0_cmd_path;
+
+        if (!access(gti0_procfs_path, R_OK))
+            heatmap_path = gti0_procfs_path;
         ::android::base::WriteStringToFd("\n<<<<<< GTI0 >>>>>>\n\n", fd);
 
         // Enable: force touch active
@@ -878,27 +883,27 @@ void Dumpstate::dumpTouchSection(int fd) {
         DumpFileToFd(fd, "Touch Firmware Version", cmd);
 
         // Get Mutual Sensing Data - Baseline
-        snprintf(cmd, sizeof(cmd), "cat %s/ms_base", gti0_cmd_path);
+        snprintf(cmd, sizeof(cmd), "cat %s/ms_base", heatmap_path);
         RunCommandToFd(fd, "Get Mutual Sensing Data - Baseline", {"/vendor/bin/sh", "-c", cmd});
 
         // Get Mutual Sensing Data - Delta
-        snprintf(cmd, sizeof(cmd), "cat %s/ms_diff", gti0_cmd_path);
+        snprintf(cmd, sizeof(cmd), "cat %s/ms_diff", heatmap_path);
         RunCommandToFd(fd, "Get Mutual Sensing Data - Delta", {"/vendor/bin/sh", "-c", cmd});
 
         // Get Mutual Sensing Data - Raw
-        snprintf(cmd, sizeof(cmd), "cat %s/ms_raw", gti0_cmd_path);
+        snprintf(cmd, sizeof(cmd), "cat %s/ms_raw", heatmap_path);
         RunCommandToFd(fd, "Get Mutual Sensing Data - Raw", {"/vendor/bin/sh", "-c", cmd});
 
         // Get Self Sensing Data - Baseline
-        snprintf(cmd, sizeof(cmd), "cat %s/ss_base", gti0_cmd_path);
+        snprintf(cmd, sizeof(cmd), "cat %s/ss_base", heatmap_path);
         RunCommandToFd(fd, "Get Self Sensing Data - Baseline", {"/vendor/bin/sh", "-c", cmd});
 
         // Get Self Sensing Data - Delta
-        snprintf(cmd, sizeof(cmd), "cat %s/ss_diff", gti0_cmd_path);
+        snprintf(cmd, sizeof(cmd), "cat %s/ss_diff", heatmap_path);
         RunCommandToFd(fd, "Get Self Sensing Data - Delta", {"/vendor/bin/sh", "-c", cmd});
 
         // Get Self Sensing Data - Raw
-        snprintf(cmd, sizeof(cmd), "cat %s/ss_raw", gti0_cmd_path);
+        snprintf(cmd, sizeof(cmd), "cat %s/ss_raw", heatmap_path);
         RunCommandToFd(fd, "Get Self Sensing Data - Raw", {"/vendor/bin/sh", "-c", cmd});
 
         // Self Test