diff --git a/device.mk b/device.mk
index b083bfcb..8d7d83cc 100644
--- a/device.mk
+++ b/device.mk
@@ -245,7 +245,7 @@ endif
 # Configure EGL blobcache
 PRODUCT_VENDOR_PROPERTIES += \
        ro.egl.blobcache.multifile=true \
-       ro.egl.blobcache.multifile_limit=134217728 \
+       ro.egl.blobcache.multifile_limit=33554432 \
 
 PRODUCT_VENDOR_PROPERTIES += \
 	ro.opengles.version=196610 \
diff --git a/device_framework_matrix_product.xml b/device_framework_matrix_product.xml
index beffb913..4184c3e0 100644
--- a/device_framework_matrix_product.xml
+++ b/device_framework_matrix_product.xml
@@ -62,7 +62,7 @@
     </hal>
     <hal format="aidl" optional="true">
         <name>com.google.edgetpu.dba</name>
-        <version>2</version>
+        <version>1</version>
         <interface>
             <name>IDevice</name>
             <instance>default</instance>
diff --git a/media_codecs_performance_c2.xml b/media_codecs_performance_c2.xml
index e49ef219..358586ea 100644
--- a/media_codecs_performance_c2.xml
+++ b/media_codecs_performance_c2.xml
@@ -178,22 +178,16 @@
 
     <Encoders>
         <MediaCodec name="c2.exynos.h264.encoder" type="video/avc" update="true">
-            <Limit name="measured-frame-rate-320x240" range="371-554" />
-            <!-- measured 90%:301-313 med:302 N=2 -->
-            <Limit name="measured-frame-rate-720x480" range="301-307" /> <!-- v90%=1.0 -->
-            <!-- measured 90%:181-201 med:181 N=2 -->
-            <Limit name="measured-frame-rate-1280x720" range="181-190" /> <!-- v90%=1.1 -->
-            <!-- measured 90%:98-100 med:99 N=2 -->
-            <Limit name="measured-frame-rate-1920x1080" range="98-99" /> <!-- v90%=1.0 -->
+            <Limit name="measured-frame-rate-320x240" range="372-551" />
+            <Limit name="measured-frame-rate-720x480" range="221-308" />
+            <Limit name="measured-frame-rate-1280x720" range="151-190" />
+            <Limit name="measured-frame-rate-1920x1080" range="58-99" />
         </MediaCodec>
         <MediaCodec name="c2.exynos.hevc.encoder" type="video/hevc" update="true">
-            <Limit name="measured-frame-rate-320x240" range="365-546" />
-            <!-- measured 90%:291-304 med:292 N=2 -->
-            <Limit name="measured-frame-rate-720x480" range="291-298" /> <!-- v90%=1.0 -->
-            <!-- measured 90%:195-201 med:196 N=2 -->
-            <Limit name="measured-frame-rate-1280x720" range="195-198" /> <!-- v90%=1.0 -->
-            <!-- measured 90%:94-96 med:95 N=2 -->
-            <Limit name="measured-frame-rate-1920x1080" range="94-95" /> <!-- v90%=1.0 -->
+            <Limit name="measured-frame-rate-320x240" range="371-553" />
+            <Limit name="measured-frame-rate-720x480" range="214-305" />
+            <Limit name="measured-frame-rate-1280x720" range="154-198" />
+            <Limit name="measured-frame-rate-1920x1080" range="46-97" />
         </MediaCodec>
         <MediaCodec name="c2.exynos.mpeg4.encoder" type="video/mp4v-es" update="true">
             <Limit name="measured-frame-rate-176x144" range="280-451" /> <!-- v90%=1.1 -->