diff --git a/device-felix.mk b/device-felix.mk
index 6c675aa..77daa12 100644
--- a/device-felix.mk
+++ b/device-felix.mk
@@ -301,7 +301,8 @@ PRODUCT_PROPERTY_OVERRIDES += \
     persist.vendor.camera.optimized_tnr_freq=1 \
     persist.vendor.camera.raise_buf_allocation_priority=1 \
     camera.enable_landscape_to_portrait=true \
-    persist.vendor.camera.debug.bypass_csi_link_error=true
+    persist.vendor.camera.debug.bypass_csi_link_error=true \
+    vendor.camera.allow_sensor_binning_aspect_ratio_to_override_itp_output=false
 
 # Enable camera exif model/make reporting
 PRODUCT_VENDOR_PROPERTIES += \
diff --git a/powerhint.json b/powerhint.json
index c8a9e58..95967a0 100644
--- a/powerhint.json
+++ b/powerhint.json
@@ -1558,6 +1558,12 @@
       "Duration": 0,
       "Value": "572000"
     },
+    {
+      "PowerHint": "ADPF_FIRST_FRAME",
+      "Node": "GPUMinFreq",
+      "Duration": 50,
+      "Value": "302000"
+    },
     {
       "PowerHint": "THERMAL_VIRTUAL-SKIN-HINT_LIGHT",
       "Node": "PMU_POLL",
diff --git a/vibrator/OWNERS b/vibrator/OWNERS
index 5d4a9c3..859c7e0 100644
--- a/vibrator/OWNERS
+++ b/vibrator/OWNERS
@@ -1,3 +1,4 @@
-chasewu@google.com
+chrispaulo@google.com
 michaelwr@google.com
+nathankulczak@google.com
 taikuo@google.com