diff --git a/proprietary/vendor/etc/qcril_database/upgrade/config/11.0_config.sql b/proprietary/vendor/etc/qcril_database/upgrade/config/11.0_config.sql
new file mode 100644
index 0000000..a5de476
--- /dev/null
+++ b/proprietary/vendor/etc/qcril_database/upgrade/config/11.0_config.sql
@@ -0,0 +1,11 @@
+
+/*
+  Copyright (c) 2021 Qualcomm Technologies, Inc.
+  All Rights Reserved.
+  Confidential and Proprietary - Qualcomm Technologies, Inc.
+*/
+
+CREATE TABLE IF NOT EXISTS qcril_properties_table (property TEXT PRIMARY KEY NOT NULL, def_val TEXT, value TEXT);
+UPDATE qcril_properties_table set def_val='11' where property='qcrildb_version';UPDATE qcril_properties_table SET def_val="" WHERE property="all_bc_msg";
+UPDATE qcril_properties_table SET def_val="1" WHERE property="persist.vendor.radio.custom_ecc";
+UPDATE qcril_properties_table SET def_val="1" WHERE property="persist.vendor.radio.cs_srv_type";
diff --git a/proprietary/vendor/etc/qcril_database/upgrade/ecc/31_version_qcrildb.sql b/proprietary/vendor/etc/qcril_database/upgrade/ecc/31_version_qcrildb.sql
new file mode 100644
index 0000000..aeebf1d
--- /dev/null
+++ b/proprietary/vendor/etc/qcril_database/upgrade/ecc/31_version_qcrildb.sql
@@ -0,0 +1,11 @@
+
+CREATE TABLE IF NOT EXISTS qcril_properties_table (property TEXT, def_val TEXT, value TEXT, PRIMARY KEY(property));
+
+UPDATE qcril_properties_table set value='31' where property='qcrildb_version';
+DELETE FROM qcril_emergency_source_mcc_table where MCC = '740' AND NUMBER = '101';
+
+INSERT OR REPLACE INTO "qcril_emergency_source_mcc_mnc_table" VALUES('740','00','123','','');
+
+INSERT OR REPLACE INTO "qcril_emergency_source_mcc_mnc_table" VALUES('740','01','101','','');
+INSERT OR REPLACE INTO "qcril_emergency_source_mcc_mnc_table" VALUES('740','02','101','','');
+
diff --git a/proprietary/vendor/etc/qcril_database/upgrade/ecc/34_version_qcrildb.sql b/proprietary/vendor/etc/qcril_database/upgrade/ecc/34_version_qcrildb.sql
new file mode 100644
index 0000000..d51c29b
--- /dev/null
+++ b/proprietary/vendor/etc/qcril_database/upgrade/ecc/34_version_qcrildb.sql
@@ -0,0 +1,11 @@
+
+CREATE TABLE IF NOT EXISTS qcril_properties_table (property TEXT, def_val TEXT, value TEXT, PRIMARY KEY(property));
+
+UPDATE qcril_properties_table set value='34' where property='qcrildb_version';
+INSERT OR REPLACE INTO "qcril_emergency_source_mcc_mnc_table" VALUES('242','02','110','','');
+INSERT OR REPLACE INTO "qcril_emergency_source_mcc_mnc_table" VALUES('242','02','113','','');
+INSERT OR REPLACE INTO "qcril_emergency_source_mcc_mnc_table" VALUES('242','05','110','','');
+INSERT OR REPLACE INTO "qcril_emergency_source_mcc_mnc_table" VALUES('242','05','113','','');
+
+
+
diff --git a/proprietary/vendor/etc/qcril_database/upgrade/ecc/35_version_qcrildb.sql b/proprietary/vendor/etc/qcril_database/upgrade/ecc/35_version_qcrildb.sql
new file mode 100644
index 0000000..ebdbb59
--- /dev/null
+++ b/proprietary/vendor/etc/qcril_database/upgrade/ecc/35_version_qcrildb.sql
@@ -0,0 +1,7 @@
+
+CREATE TABLE IF NOT EXISTS qcril_properties_table (property TEXT, def_val TEXT, value TEXT, PRIMARY KEY(property));
+
+UPDATE qcril_properties_table set value='35' where property='qcrildb_version';
+INSERT OR REPLACE  INTO "qcril_emergency_source_voice_table" VALUES('466','110','','full');
+INSERT OR REPLACE  INTO "qcril_emergency_source_voice_table" VALUES('466','119','','full');
+
diff --git a/proprietary/vendor/etc/qcril_database/upgrade/ecc/39_version_qcrildb.sql b/proprietary/vendor/etc/qcril_database/upgrade/ecc/39_version_qcrildb.sql
new file mode 100644
index 0000000..4aaf5c4
--- /dev/null
+++ b/proprietary/vendor/etc/qcril_database/upgrade/ecc/39_version_qcrildb.sql
@@ -0,0 +1,14 @@
+
+CREATE TABLE IF NOT EXISTS qcril_properties_table (property TEXT, def_val TEXT, value TEXT, PRIMARY KEY(property));
+
+UPDATE qcril_properties_table set value='39' where property='qcrildb_version';
+INSERT OR REPLACE  INTO "qcril_emergency_source_mcc_table" VALUES('450','111','','');
+INSERT OR REPLACE  INTO "qcril_emergency_source_mcc_table" VALUES('450','112','','');
+INSERT OR REPLACE  INTO "qcril_emergency_source_mcc_table" VALUES('450','113','','');
+INSERT OR REPLACE  INTO "qcril_emergency_source_mcc_table" VALUES('450','117','','');
+INSERT OR REPLACE  INTO "qcril_emergency_source_mcc_table" VALUES('450','118','','');
+INSERT OR REPLACE  INTO "qcril_emergency_source_mcc_table" VALUES('450','119','','');
+INSERT OR REPLACE  INTO "qcril_emergency_source_mcc_table" VALUES('450','122','','');
+INSERT OR REPLACE  INTO "qcril_emergency_source_mcc_table" VALUES('450','125','','');
+INSERT OR REPLACE  INTO "qcril_emergency_source_mcc_table" VALUES('450','911','','');
+
diff --git a/proprietary/vendor/etc/vintf/manifest/vendor.dolby.media.c2@1.0-service.xml b/proprietary/vendor/etc/vintf/manifest/vendor.dolby.media.c2@1.0-service.xml
new file mode 100644
index 0000000..4706852
--- /dev/null
+++ b/proprietary/vendor/etc/vintf/manifest/vendor.dolby.media.c2@1.0-service.xml
@@ -0,0 +1,24 @@
+<!--
+
+     This program is protected under international and U.S. copyright laws as
+     an unpublished work. This program is confidential and proprietary to the
+     copyright owners. Reproduction or disclosure, in whole or in part, or the
+     production of derivative works therefrom without the express permission of
+     the copyright owners is prohibited.
+
+                   Copyright (C) 2020-2021 by Dolby Laboratories,
+                               All rights reserved.
+
+-->
+<manifest version="1.0" type="device">
+    <hal format="hidl" override="true">
+        <name>android.hardware.media.c2</name>
+        <transport>hwbinder</transport>
+        <version>1.0</version>
+        <interface>
+            <name>IComponentStore</name>
+            <instance>default</instance>
+            <instance>software</instance>
+        </interface>
+    </hal>
+</manifest>