diff --git a/conf/init.zumapro.board.rc b/conf/init.zumapro.board.rc
index 9c4b87f..d6480f2 100644
--- a/conf/init.zumapro.board.rc
+++ b/conf/init.zumapro.board.rc
@@ -173,6 +173,9 @@ on init
     chown root system /sys/devices/platform/16490000.gsa-ns/log_main
     chown root system /sys/devices/platform/16490000.gsa-ns/log_intermediate
 
+    # Enable CPU Idle histograms
+    write /sys/kernel/metrics/cpuidle_histogram/enable 1
+
 on post-fs
     # Ensure device is ready and start storageproxyd
     wait /dev/sg1
diff --git a/default-permissions.xml b/default-permissions.xml
index 2d04542..2f6f13f 100644
--- a/default-permissions.xml
+++ b/default-permissions.xml
@@ -68,6 +68,13 @@
         <permission name="android.permission.POST_NOTIFICATIONS" fixed="false"/>
     </exception>
 
+    <exception package="com.google.android.apps.pixel.relationships">
+        <!-- Contacts -->
+        <permission name="android.permission.READ_CALL_LOG" fixed="false"/>
+        <permission name="android.permission.READ_CONTACTS" fixed="false"/>
+        <permission name="android.permission.WRITE_CONTACTS" fixed="false"/>
+    </exception>
+
     <exception package="com.google.android.apps.cbrsnetworkmonitor">
         <!-- Location access to create CBRS geofences-->
         <permission name="android.permission.ACCESS_FINE_LOCATION" fixed="true"/>
diff --git a/device.mk b/device.mk
index 7427383..bea72a1 100644
--- a/device.mk
+++ b/device.mk
@@ -398,6 +398,7 @@ PRODUCT_VENDOR_PROPERTIES += \
 DEVICE_MANIFEST_FILE := \
 	device/google/zumapro/manifest.xml
 
+BOARD_USE_CODEC2_AIDL := V1
 ifneq (,$(filter aosp_%,$(TARGET_PRODUCT)))
 DEVICE_MANIFEST_FILE += \
 	device/google/zumapro/manifest_media_aosp.xml
@@ -886,12 +887,19 @@ PRODUCT_COPY_FILES += \
 	device/google/zumapro/media_codecs_performance_c2.xml:$(TARGET_COPY_OUT_VENDOR)/etc/media_codecs_performance_c2.xml \
 
 PRODUCT_PROPERTY_OVERRIDES += \
-       debug.stagefright.c2-poolmask=458752 \
        debug.c2.use_dmabufheaps=1 \
        media.c2.dmabuf.padding=512 \
        debug.stagefright.ccodec_delayed_params=1 \
        ro.vendor.gpu.dataspace=1
 
+ifneq ($(BOARD_USE_CODEC2_AIDL), )
+PRODUCT_PROPERTY_OVERRIDES += \
+        debug.stagefright.c2-poolmask=1507328
+else
+PRODUCT_PROPERTY_OVERRIDES += \
+        debug.stagefright.c2-poolmask=458752
+endif
+
 # Create input surface on the framework side
 PRODUCT_PROPERTY_OVERRIDES += \
 	debug.stagefright.c2inputsurface=-1 \