diff --git a/device.mk b/device.mk
index 9dbed533..373ab487 100644
--- a/device.mk
+++ b/device.mk
@@ -228,8 +228,8 @@ DEVICE_MATRIX_FILE := \
 
 DEVICE_PACKAGE_OVERLAYS += device/google/gs201/overlay
 
-# This will be updated to 31 (Android S) for shipping
-PRODUCT_SHIPPING_API_LEVEL := 30
+# This will be updated to 33 (Android T) for shipping
+PRODUCT_SHIPPING_API_LEVEL := 31
 
 # Temporarily disable the debugfs restriction on 31 (Android S)
 PRODUCT_SET_DEBUGFS_RESTRICTIONS := false
diff --git a/device_framework_matrix_product.xml b/device_framework_matrix_product.xml
index a8f77006..72d536f7 100644
--- a/device_framework_matrix_product.xml
+++ b/device_framework_matrix_product.xml
@@ -1,4 +1,20 @@
-<compatibility-matrix version="1.0" type="framework" level="5">
+<compatibility-matrix version="1.0" type="framework" level="6">
+    <hal format="aidl">
+        <name>android.hardware.contexthub</name>
+        <version>1</version>
+        <interface>
+            <name>IContextHub</name>
+            <instance>default</instance>
+        </interface>
+    </hal>
+    <hal format="aidl">
+        <name>android.hardware.graphics.composer3</name>
+        <version>1</version>
+        <interface>
+            <name>IComposer</name>
+            <instance>default</instance>
+        </interface>
+    </hal>
     <hal format="hidl" optional="true">
         <name>android.hardware.radio</name>
         <version>1.2</version>
@@ -15,6 +31,14 @@
             <instance>dual</instance>
         </interface>
     </hal>
+    <hal format="aidl">
+        <name>android.hardware.wifi.hostapd</name>
+        <version>1</version>
+        <interface>
+            <name>IHostapd</name>
+            <instance>default</instance>
+        </interface>
+    </hal>
     <hal format="hidl" optional="true">
         <name>android.vendor.samsung_slsi.telephony.hardware.radio</name>
         <version>1.1</version>
diff --git a/manifest-gralloc3.xml b/manifest-gralloc3.xml
index 4ae12513..5ea7c7ea 100644
--- a/manifest-gralloc3.xml
+++ b/manifest-gralloc3.xml
@@ -1,4 +1,4 @@
-<manifest version="1.0" type="device" target-level="5">
+<manifest version="1.0" type="device" target-level="6">
    <hal format="hidl">
         <name>android.hardware.audio</name>
         <transport>hwbinder</transport>
diff --git a/manifest.xml b/manifest.xml
index 19bf68f9..b80598c0 100644
--- a/manifest.xml
+++ b/manifest.xml
@@ -1,4 +1,4 @@
-<manifest version="1.0" type="device" target-level="5">
+<manifest version="1.0" type="device" target-level="6">
    <hal format="hidl">
         <name>android.hardware.audio</name>
         <transport>hwbinder</transport>