Merge cherrypicks of ['googleplex-android-review.googlesource.com/25616149'] into udc-qpr1-release.
Change-Id: I4193363030c8ad0c80e39b4325d4a126a3e7c08f
diff --git a/device.mk b/device.mk
index 3261041..92de7e8 100644
--- a/device.mk
+++ b/device.mk
@@ -191,7 +191,7 @@
# Carrier configuration default location
PRODUCT_PROPERTY_OVERRIDES += \
- persist.vendor.radio.config.carrier_config_dir=/mnt/vendor/modem_img/images/default/confpack
+ persist.vendor.radio.config.carrier_config_dir=/vendor/firmware/carrierconfig
PRODUCT_PROPERTY_OVERRIDES += \
telephony.active_modems.max_count=2