diff --git a/conf/init.zuma.rc b/conf/init.zuma.rc
index bd51a33f..e5e199d5 100644
--- a/conf/init.zuma.rc
+++ b/conf/init.zuma.rc
@@ -365,6 +365,10 @@ on init
     chown system system /sys/devices/platform/13120000.pcie/link_stats/link_recovery_failures
     chown system system /sys/devices/platform/13120000.pcie/link_stats/link_up_failures
 
+    # Change GSA log group for dumpstate
+    chown root system /sys/devices/platform/16490000.gsa-ns/log_main
+    chown root system /sys/devices/platform/16490000.gsa-ns/log_intermediate
+
 on post-fs
     # Ensure device is ready and start storageproxyd
     wait /dev/sg1
@@ -840,14 +844,6 @@ on property:sys.boot_completed=1
     chown root system /sys/devices/platform/19000000.aoc/reset
     chmod 0220 /sys/devices/platform/19000000.aoc/reset
 
-    # AOC UDFPS clock compensation permission
-    chown system system /sys/devices/platform/17000000.aoc/control/udfps_set_clock_source
-    chmod 220 /sys/devices/platform/17000000.aoc/control/udfps_set_clock_source
-    chown system system /sys/devices/platform/17000000.aoc/control/udfps_get_osc_freq
-    chmod 440 /sys/devices/platform/17000000.aoc/control/udfps_get_osc_freq
-    chown system system /sys/devices/platform/17000000.aoc/control/udfps_get_disp_freq
-    chmod 440 /sys/devices/platform/17000000.aoc/control/udfps_get_disp_freq
-
     # write serialno to battery path for pairing
     write /sys/class/power_supply/battery/dev_sn ${ro.boot.serialno}
 
diff --git a/conf/ueventd.zuma.rc b/conf/ueventd.zuma.rc
index 7483184a..c3a57cba 100644
--- a/conf/ueventd.zuma.rc
+++ b/conf/ueventd.zuma.rc
@@ -227,3 +227,8 @@
 
 # Wlan
 /dev/wlan                              0660   wifi       wifi
+
+# Udfps
+/sys/bus/aoc/devices/control    udfps_set_clock_source  0220    system  system
+/sys/bus/aoc/devices/control    udfps_get_osc_freq      0440    system  system
+/sys/bus/aoc/devices/control    udfps_get_disp_freq     0440    system  system
diff --git a/device.mk b/device.mk
index e9eb238d..7dd7fb1f 100644
--- a/device.mk
+++ b/device.mk
@@ -698,7 +698,7 @@ PRODUCT_COPY_FILES += \
 	device/google/zuma/display/display_colordata_cal0.pb:$(TARGET_COPY_OUT_VENDOR)/etc/display_colordata_cal0.pb
 
 # limit DPP downscale ratio
-PRODUCT_DEFAULT_PROPERTY_OVERRIDES += vendor.hwc.dpp.downscale=2
+PRODUCT_DEFAULT_PROPERTY_OVERRIDES += vendor.hwc.dpp.downscale=3
 
 # Cannot reference variables defined in BoardConfig.mk, uncomment this if
 # BOARD_USES_EXYNOS_DSS_FEATURE is true
diff --git a/device_framework_matrix_product.xml b/device_framework_matrix_product.xml
index 811c2885..749d6daa 100644
--- a/device_framework_matrix_product.xml
+++ b/device_framework_matrix_product.xml
@@ -1,15 +1,17 @@
-<compatibility-matrix version="1.0" type="framework" level="7">
-    <hal format="aidl" optional="true">
-        <name>android.hardware.biometrics.face</name>
+<compatibility-matrix version="1.0" type="framework" level="8">
+    <hal format="hidl" optional="true">
+        <name>android.hardware.boot</name>
+        <version>1.2</version>
         <interface>
-            <name>IFace</name>
+            <name>IBootControl</name>
             <instance>default</instance>
         </interface>
     </hal>
-    <hal format="aidl" optional="true">
-        <name>android.hardware.biometrics.fingerprint</name>
+    <hal format="hidl" optional="true">
+        <name>android.hardware.cas</name>
+        <version>1.2</version>
         <interface>
-            <name>IFingerprint</name>
+            <name>IMediaCasService</name>
             <instance>default</instance>
         </interface>
     </hal>
@@ -29,6 +31,14 @@
             <instance>default</instance>
         </interface>
     </hal>
+    <hal format="hidl" optional="true">
+        <name>android.hardware.neuralnetworks</name>
+        <version>1.3</version>
+        <interface>
+            <name>IDevice</name>
+            <instance>google-armnn</instance>
+        </interface>
+    </hal>
     <hal format="hidl" optional="true">
         <name>android.hardware.radio</name>
         <version>1.2</version>
@@ -37,14 +47,6 @@
             <instance>slot2</instance>
         </interface>
     </hal>
-    <hal format="hidl" optional="true">
-        <name>android.hardware.radio.config</name>
-        <version>1.1</version>
-        <interface>
-            <name>IRadioConfig</name>
-            <instance>default</instance>
-        </interface>
-    </hal>
     <hal format="aidl" optional="true">
         <name>android.hardware.vibrator</name>
         <version>2</version>
diff --git a/dumpstate/Android.bp b/dumpstate/Android.bp
index 7494e694..d5ec7add 100644
--- a/dumpstate/Android.bp
+++ b/dumpstate/Android.bp
@@ -23,3 +23,9 @@ sh_binary {
     sub_dir: "dump",
 }
 
+sh_binary {
+    name: "dump_gsa.sh",
+    src: "dump_gsa.sh",
+    vendor: true,
+    sub_dir: "dump",
+}
diff --git a/dumpstate/dump_gsa.sh b/dumpstate/dump_gsa.sh
new file mode 100644
index 00000000..a0d42324
--- /dev/null
+++ b/dumpstate/dump_gsa.sh
@@ -0,0 +1,8 @@
+#!/vendor/bin/sh
+
+echo "--- GSA MAIN LOG"
+cat /sys/devices/platform/16490000.gsa-ns/log_main
+
+echo "--- GSA INTERMEDIATE LOG"
+cat /sys/devices/platform/16490000.gsa-ns/log_intermediate
+
diff --git a/dumpstate/item.mk b/dumpstate/item.mk
index 00ef3e6d..124fd1c2 100644
--- a/dumpstate/item.mk
+++ b/dumpstate/item.mk
@@ -1,5 +1,6 @@
 PRODUCT_PACKAGES += dump_wlan.sh \
 		    dump_power.sh
 
-PRODUCT_PACKAGES_DEBUG += dump_cma.sh
+PRODUCT_PACKAGES_DEBUG += dump_cma.sh \
+			  dump_gsa.sh
 
diff --git a/manifest.xml b/manifest.xml
index fcc6aae0..e5678026 100644
--- a/manifest.xml
+++ b/manifest.xml
@@ -1,4 +1,4 @@
-<manifest version="1.0" type="device" target-level="7">
+<manifest version="1.0" type="device" target-level="8">
     <hal format="hidl">
         <name>android.hardware.graphics.mapper</name>
         <transport arch="32+64">passthrough</transport>