diff --git a/device-felix.mk b/device-felix.mk
index 199e2c9..cc75c91 100644
--- a/device-felix.mk
+++ b/device-felix.mk
@@ -218,7 +218,7 @@ PRODUCT_SOONG_NAMESPACES += \
 
 # Increment the SVN for any official public releases
 PRODUCT_VENDOR_PROPERTIES += \
-    ro.vendor.build.svn=52
+    ro.vendor.build.svn=53
 
 # Vibrator HAL
 $(call soong_config_set,haptics,kernel_ver,v$(subst .,_,$(TARGET_LINUX_KERNEL_VERSION)))
diff --git a/device_framework_matrix_product_felix.xml b/device_framework_matrix_product_felix.xml
index 3fd94a9..475edd2 100644
--- a/device_framework_matrix_product_felix.xml
+++ b/device_framework_matrix_product_felix.xml
@@ -1,7 +1,7 @@
 <compatibility-matrix version="1.0" type="framework" level="7">
     <hal format="aidl" optional="true">
       <name>com.google.hardware.pixel.display</name>
-        <version>11-12</version>
+        <version>12</version>
         <interface>
             <name>IDisplay</name>
             <instance>secondary</instance>
diff --git a/vibrator/OWNERS b/vibrator/OWNERS
index 859c7e0..dec74a8 100644
--- a/vibrator/OWNERS
+++ b/vibrator/OWNERS
@@ -1,4 +1 @@
-chrispaulo@google.com
-michaelwr@google.com
-nathankulczak@google.com
-taikuo@google.com
+file:platform/hardware/google/pixel:/vibrator/OWNERS
diff --git a/vibrator/cs40l26/tests/Android.bp b/vibrator/cs40l26/tests/Android.bp
index 48baa90..0924709 100644
--- a/vibrator/cs40l26/tests/Android.bp
+++ b/vibrator/cs40l26/tests/Android.bp
@@ -26,7 +26,6 @@ cc_test {
         "test-vibrator.cpp",
     ],
     static_libs: [
-        "libc++fs",
         "libgmock",
     ],
     shared_libs: [