diff --git a/manifest.xml b/manifest.xml
index 6130f67..f6dc21e 100644
--- a/manifest.xml
+++ b/manifest.xml
@@ -45,15 +45,6 @@
             <instance>default</instance>
         </interface>
     </hal>
-    <hal format="hidl">
-        <name>android.hardware.media.c2</name>
-        <transport>hwbinder</transport>
-        <version>1.0</version>
-        <interface>
-            <name>IComponentStore</name>
-            <instance>default</instance>
-        </interface>
-    </hal>
     <hal format="hidl">
         <name>android.hardware.media.omx</name>
         <transport>hwbinder</transport>
diff --git a/media/media_codecs.xml b/media/media_codecs.xml
index f14279e..1ffc1c3 100644
--- a/media/media_codecs.xml
+++ b/media/media_codecs.xml
@@ -17,7 +17,7 @@
 -->
 
 <MediaCodecs>
-    <!-- <Include href="media_codecs_v4l2_c2_video.xml" /> -->
+    <Include href="media_codecs_v4l2_c2_video.xml" />
     <Include href="media_codecs_google_c2_audio.xml" />
     <Include href="media_codecs_google_c2_tv.xml" />
     <Include href="media_codecs_google_c2_video.xml" />
diff --git a/vendor.prop b/vendor.prop
index c2d0cfe..2e5f387 100644
--- a/vendor.prop
+++ b/vendor.prop
@@ -60,6 +60,8 @@ persist.device_config.mglru_native.lru_gen_config=core
 
 # V4L2
 debug.stagefright.c2-poolmask=0xf50000
+persist.v4l2_codec2.rank.decoder=128
+persist.v4l2_codec2.rank.encoder=128
 ro.vendor.v4l2_codec2.decode_concurrent_instances=8
 ro.vendor.v4l2_codec2.encode_concurrent_instances=8