diff --git a/BoardConfig-common.mk b/BoardConfig-common.mk
index b1d2d4dc..7883c20c 100644
--- a/BoardConfig-common.mk
+++ b/BoardConfig-common.mk
@@ -133,6 +133,10 @@ BOARD_AVB_VBMETA_SYSTEM_ALGORITHM := SHA256_RSA2048
 BOARD_AVB_VBMETA_SYSTEM_ROLLBACK_INDEX := $(PLATFORM_SECURITY_PATCH_TIMESTAMP)
 BOARD_AVB_VBMETA_SYSTEM_ROLLBACK_INDEX_LOCATION := 1
 
+ifneq ($(PRODUCT_BUILD_PVMFW_IMAGE),false)
+BOARD_AVB_VBMETA_SYSTEM += pvmfw
+endif
+
 # Enable chained vbmeta for boot images
 BOARD_AVB_BOOT_KEY_PATH := external/avb/test/data/testkey_rsa2048.pem
 BOARD_AVB_BOOT_ALGORITHM := SHA256_RSA2048
diff --git a/media_codecs_performance_c2.xml b/media_codecs_performance_c2.xml
index d8f1f609..c25312be 100644
--- a/media_codecs_performance_c2.xml
+++ b/media_codecs_performance_c2.xml
@@ -152,16 +152,13 @@
             <Limit name="measured-frame-rate-1920x1080" range="39-40" /> <!-- v90%=1.0 -->
         </MediaCodec>
         <MediaCodec name="c2.google.av1.decoder" type="video/av01" update="true">
-            <!-- measured 90%:295-301 med:296 N=2 -->
-            <Limit name="measured-frame-rate-352x288" range="295-298" /> <!-- v90%=1.0 -->
-            <!-- measured 90%:196-207 med:196 N=2 -->
-            <Limit name="measured-frame-rate-640x360" range="196-201" /> <!-- v90%=1.0 -->
-            <!-- measured 90%:177-180 med:178 N=2 -->
-            <Limit name="measured-frame-rate-720x480" range="177-178" /> <!-- v90%=1.0 -->
-            <!-- measured 90%:81-82 med:82 N=2 -->
-            <Limit name="measured-frame-rate-1280x720" range="81-82" /> <!-- v90%=1.0 -->
-            <!-- measured 90%:45-47 med:46 N=2 -->
-            <Limit name="measured-frame-rate-1920x1080" range="45-46" /> <!-- v90%=1.0 -->
+            <Limit name="measured-frame-rate-352x288" range="410-416" /> <!-- N=20 v90%=1.7 -->
+            <!-- measured 90%:251-660 med:361 SLOW -->
+            <Limit name="measured-frame-rate-640x360" range="361-407" /> <!-- N=20 v90%=1.6 -->
+            <!-- measured 90%:250-684 med:366 SLOW -->
+            <Limit name="measured-frame-rate-720x480" range="366-414" /> <!-- N=20 v90%=1.7 -->
+            <Limit name="measured-frame-rate-1280x720" range="252-259" /> <!-- N=22 v90%=1.1 -->
+            <Limit name="measured-frame-rate-1920x1080" range="210-213" /> <!-- N=20 v90%=1.1 -->
         </MediaCodec>
         <MediaCodec name="c2.google.av1.decoder.secure" type="video/av01" update="true">
             <!-- measured 90%:295-301 med:296 N=2 -->
@@ -175,6 +172,12 @@
             <!-- measured 90%:45-47 med:46 N=2 -->
             <Limit name="measured-frame-rate-1920x1080" range="45-46" /> <!-- v90%=1.0 -->
         </MediaCodec>
+        <MediaCodec name="c2.android.av1.decoder" type="video/av01" update="true">
+            <Limit name="measured-frame-rate-352x288" range="353-362" />
+            <Limit name="measured-frame-rate-640x360" range="178-210" />
+            <Limit name="measured-frame-rate-720x480" range="101-129" />
+            <Limit name="measured-frame-rate-1280x720" range="38-40" />
+        </MediaCodec>
     </Decoders>
 
     <Encoders>