diff --git a/conf/init.gs201.rc b/conf/init.gs201.rc
index bce8ffad..bc2b5e81 100644
--- a/conf/init.gs201.rc
+++ b/conf/init.gs201.rc
@@ -368,6 +368,7 @@ on post-fs-data
 
     # Permissions Camera
     mkdir /data/vendor/camera 0770 system camera
+    mkdir /data/vendor/camera/video_bokeh_node 0770 system camera
     chmod 0755 /sys/kernel/debug/tracing
     restorecon /sys/kernel/debug/tracing/trace_marker
 
diff --git a/device.mk b/device.mk
index 5e2570af..7b13ccea 100644
--- a/device.mk
+++ b/device.mk
@@ -1178,3 +1178,6 @@ PRODUCT_COPY_FILES += \
 
 # Call deleteAllKeys if vold detects a factory reset
 PRODUCT_VENDOR_PROPERTIES += ro.crypto.metadata_init_delete_all_keys.enabled?=true
+
+# Hardware Info
+include hardware/google/pixel/HardwareInfo/HardwareInfo.mk
diff --git a/device_framework_matrix_product.xml b/device_framework_matrix_product.xml
index 7744771b..40181c61 100644
--- a/device_framework_matrix_product.xml
+++ b/device_framework_matrix_product.xml
@@ -149,14 +149,6 @@
             <instance>default</instance>
         </interface>
     </hal>
-    <hal format="hidl">
-        <name>hardware.google.bluetooth.ccc</name>
-        <version>1.1</version>
-        <interface>
-            <name>IBluetoothCcc</name>
-            <instance>default</instance>
-        </interface>
-    </hal>
     <hal format="hidl" optional="true">
         <name>hardware.google.bluetooth.ewp</name>
         <version>1.0</version>