diff --git a/BoardConfig.mk b/BoardConfig.mk
index 04ca22d..05eb3f7 100644
--- a/BoardConfig.mk
+++ b/BoardConfig.mk
@@ -55,6 +55,11 @@ BOARD_NFC_CHIPSET := pn547
 TARGET_RECOVERY_UPDATER_LIBS := librecovery_updater_g3
 TARGET_RELEASETOOLS_EXTENSIONS := device/lge/d855
 
+# RIL
+BOARD_GLOBAL_CFLAGS += -DUSE_RIL_VERSION_10
+BOARD_GLOBAL_CPPFLAGS += -DUSE_RIL_VERSION_10
+TARGET_RIL_VARIANT := caf
+
 # Wifi
 BOARD_HAS_QCOM_WLAN := true
 BOARD_WLAN_DEVICE := qcwcn
@@ -68,7 +73,7 @@ WIFI_DRIVER_FW_PATH_AP := "ap"
 WIFI_DRIVER_FW_PATH_STA := "sta"
 WPA_SUPPLICANT_VERSION := VER_0_8_X
 
-#FM Radio
+# FM Radio
 AUDIO_FEATURE_ENABLED_FM_POWER_OPT := true
 TARGET_QCOM_NO_FM_FIRMWARE := true
 
diff --git a/device.mk b/device.mk
index 8c133af..a87e966 100644
--- a/device.mk
+++ b/device.mk
@@ -44,6 +44,10 @@ PRODUCT_COPY_FILES += \
 PRODUCT_PACKAGES += \
     librecovery_updater_g3
 
+# RIL
+PRODUCT_PACKAGES += \
+    librmnetctl
+
 # Wifi
 PRODUCT_PACKAGES += \
     hostapd_default.conf \
diff --git a/overlay/frameworks/base/core/res/res/values/config.xml b/overlay/frameworks/base/core/res/res/values/config.xml
index bb5a88a..57f9ea5 100644
--- a/overlay/frameworks/base/core/res/res/values/config.xml
+++ b/overlay/frameworks/base/core/res/res/values/config.xml
@@ -27,10 +27,4 @@
          provisioning, availability etc -->
     <bool name="config_carrier_volte_available">true</bool>
 
-    <!-- The RadioAccessFamilies supported by the device.
-         Empty is viewed as "all".  Only used on devices which
-         don't support RIL_REQUEST_GET_RADIO_CAPABILITY
-         format is UMTS|LTE|... -->
-    <string translatable="false" name="config_radio_access_family">GPRS|EDGE|UMTS|HSDPA|HSUPA|HSPA|LTE|HSPAP|GSM|WCDMA</string>
-
 </resources>
diff --git a/proprietary-files.txt b/proprietary-files.txt
index 5be0b63..ac96cfb 100644
--- a/proprietary-files.txt
+++ b/proprietary-files.txt
@@ -16,25 +16,27 @@ vendor/lib/libdiag.so
 vendor/lib/libdsi_netctrl.so
 vendor/lib/libdsutils.so
 vendor/lib/libidl.so
+vendor/lib/liblqe.so
 vendor/lib/libqcci_legacy.so
 vendor/lib/libqdi.so
 vendor/lib/libqdp.so
 vendor/lib/libqmi.so
 vendor/lib/libqmi_cci.so
+vendor/lib/libqmi_client_helper.so
 vendor/lib/libqmi_client_qmux.so
 vendor/lib/libqmi_common_so.so
 vendor/lib/libqmi_csi.so
-vendor/lib/libqmi_csvt_srvc.so
 vendor/lib/libqmi_encdec.so
 vendor/lib/libqmiservices.so
 
 # Radio
+etc/data/dsi_config.xml
+etc/data/netmgr_config.xml
 bin/netmgrd
 bin/qmuxd
 bin/rfs_access
 bin/rmt_storage
 lib/libmdmdetect.so
-lib/libril.so
 lib/libuicc.so
 lib/libvss_common_idl.so
 lib/libvss_common_iface.so
diff --git a/system.prop b/system.prop
index 319b9f7..dcf4465 100644
--- a/system.prop
+++ b/system.prop
@@ -1,10 +1,9 @@
 # Radio
 persist.radio.do_not_init_csvt=1
-rild.libargs=-d /dev/smd0
 rild.libpath=/vendor/lib/libril-qc-qmi-1.so
+ro.ril.telephony.mqanelements=4
 ro.telephony.call_ring.multiple=0
 ro.telephony.default_network=9
-ro.telephony.ril_class=LgeLteRIL
 telephony.lteOnCdmaDevice=0
 telephony.lteOnGsmDevice=1