diff --git a/configs/media/media_codecs_performance_sdmmagpie_v1.xml b/configs/media/media_codecs_performance_sdmmagpie_v1.xml
index 14ae7f8..cb12b7d 100644
--- a/configs/media/media_codecs_performance_sdmmagpie_v1.xml
+++ b/configs/media/media_codecs_performance_sdmmagpie_v1.xml
@@ -56,24 +56,6 @@ limitations under the License.
             <Limit name="measured-frame-rate-1280x720" range="26-56" />
             <Limit name="measured-frame-rate-1920x1080" range="20-44" />
         </MediaCodec>
-        <MediaCodec name="OMX.google.h264.encoder" type="video/avc" update="true">
-            <Limit name="measured-frame-rate-320x240" range="215-473" />
-            <Limit name="measured-frame-rate-720x480" range="100-220" />
-            <Limit name="measured-frame-rate-1280x720" range="56-123" />
-            <Limit name="measured-frame-rate-1920x1080" range="30-66" />
-        </MediaCodec>
-        <MediaCodec name="OMX.google.h263.encoder" type="video/3gpp" update="true">
-            <Limit name="measured-frame-rate-176x144" range="200-200" />
-        </MediaCodec>
-        <MediaCodec name="OMX.google.mpeg4.encoder" type="video/mp4v-es" update="true">
-            <Limit name="measured-frame-rate-176x144" range="250-550" />
-        </MediaCodec>
-        <MediaCodec name="OMX.google.vp8.encoder" type="video/x-vnd.on2.vp8" update="true">
-            <Limit name="measured-frame-rate-320x180" range="70-154" />
-            <Limit name="measured-frame-rate-640x360" range="32-70" />
-            <Limit name="measured-frame-rate-1280x720" range="17-37" />
-            <Limit name="measured-frame-rate-1920x1080" range="8-17" />
-        </MediaCodec>
         <MediaCodec name="c2.android.avc.encoder" type="video/avc" update="true">
             <Limit name="measured-frame-rate-320x240" range="178-250" />
             <Limit name="measured-frame-rate-720x480" range="69-95" />
@@ -138,42 +120,6 @@ limitations under the License.
             <Limit name="measured-frame-rate-1280x720" range="200-420" />
             <Limit name="measured-frame-rate-1920x1088" range="189-301" />
         </MediaCodec>
-        <MediaCodec name="OMX.google.h264.decoder" type="video/avc" update="true">
-            <Limit name="measured-frame-rate-320x240" range="270-594" />
-            <Limit name="measured-frame-rate-720x480" range="68-149" />
-            <Limit name="measured-frame-rate-1280x720" range="32-70" />
-            <Limit name="measured-frame-rate-1920x1080" range="13-30" />
-        </MediaCodec>
-        <MediaCodec name="OMX.google.h263.decoder" type="video/3gpp" update="true">
-            <Limit name="measured-frame-rate-176x144" range="272-600" />
-            <Limit name="measured-frame-rate-352x288" range="236-520" />
-        </MediaCodec>
-        <MediaCodec name="OMX.google.hevc.decoder" type="video/hevc" update="true">
-            <Limit name="measured-frame-rate-352x288" range="250-550" />
-            <Limit name="measured-frame-rate-640x360" range="227-500" />
-            <Limit name="measured-frame-rate-720x480" range="225-495" />
-            <Limit name="measured-frame-rate-1280x720" range="88-193" />
-            <Limit name="measured-frame-rate-1920x1080" range="48-105" />
-        </MediaCodec>
-        <MediaCodec name="OMX.google.mpeg4.decoder" update="true">
-            <Type name="video/mp4v-es">
-                <Limit name="measured-frame-rate-176x144" range="430-946" />
-            </Type>
-        </MediaCodec>
-        <MediaCodec name="OMX.google.vp8.decoder" type="video/x-vnd.on2.vp8" update="true">
-            <Limit name="measured-frame-rate-320x180" range="800-1760" />
-            <Limit name="measured-frame-rate-320x240" range="330-726" />
-            <Limit name="measured-frame-rate-640x360" range="370-405" />
-            <Limit name="measured-frame-rate-1280x720" range="22-48" />
-            <Limit name="measured-frame-rate-1920x1080" range="30-66" />
-        </MediaCodec>
-        <MediaCodec name="OMX.google.vp9.decoder" type="video/x-vnd.on2.vp9" update="true">
-            <Limit name="measured-frame-rate-320x180" range="640-720" />
-            <Limit name="measured-frame-rate-320x240" range="200-230" />
-            <Limit name="measured-frame-rate-640x360" range="81-90" />
-            <Limit name="measured-frame-rate-1280x720" range="60-85" />
-            <Limit name="measured-frame-rate-1920x1080" range="33-55" />
-        </MediaCodec>
         <MediaCodec name="c2.android.avc.decoder" type="video/avc" update="true">
             <Limit name="measured-frame-rate-320x240" range="117-160" />
             <Limit name="measured-frame-rate-720x480" range="36-49" />
diff --git a/configs/media/media_codecs_vendor_sdmmagpie_v1.xml b/configs/media/media_codecs_vendor_sdmmagpie_v1.xml
index 4cedf47..8c0b38c 100644
--- a/configs/media/media_codecs_vendor_sdmmagpie_v1.xml
+++ b/configs/media/media_codecs_vendor_sdmmagpie_v1.xml
@@ -121,10 +121,8 @@ Only the three quirks included above are recognized at this point:
 -->
 
 <MediaCodecs>
-    <Include href="media_codecs_google_audio.xml" />
-    <Include href="media_codecs_vendor_audio.xml" />
-    <Include href="media_codecs_google_telephony.xml" />
     <Settings>
+        <Domain name="telephony" enabled="true" />
         <Setting name="max-video-encoder-input-buffers" value="11" />
     </Settings>
     <Encoders>
@@ -444,5 +442,4 @@ Only the three quirks included above are recognized at this point:
         </MediaCodec>
         <!-- Audio Software  -->
     </Decoders>
-    <Include href="media_codecs_google_video.xml" />
 </MediaCodecs>
diff --git a/sm6150.mk b/sm6150.mk
index 83fc2d8..b4c039b 100644
--- a/sm6150.mk
+++ b/sm6150.mk
@@ -266,11 +266,6 @@ PRODUCT_COPY_FILES += \
     $(LOCAL_PATH)/configs/media/media_codecs_vendor_sdmmagpie_v1.xml:$(TARGET_COPY_OUT_VENDOR)/etc/media_codecs.xml \
     $(LOCAL_PATH)/configs/media/media_profiles.xml:$(TARGET_COPY_OUT_VENDOR)/etc/media_profiles_V1_0.xml
 
-PRODUCT_COPY_FILES += \
-    frameworks/av/media/libstagefright/data/media_codecs_google_audio.xml:$(TARGET_COPY_OUT_VENDOR)/etc/media_codecs_google_audio.xml \
-    frameworks/av/media/libstagefright/data/media_codecs_google_telephony.xml:$(TARGET_COPY_OUT_VENDOR)/etc/media_codecs_google_telephony.xml \
-    frameworks/av/media/libstagefright/data/media_codecs_google_video.xml:$(TARGET_COPY_OUT_VENDOR)/etc/media_codecs_google_video.xml
-
 # Network
 PRODUCT_PACKAGES += \
     android.system.net.netd@1.1.vendor \