diff --git a/Android.mk b/Android.mk
index 30d923b7..15a772c3 100644
--- a/Android.mk
+++ b/Android.mk
@@ -6,22 +6,22 @@ LOCAL_PATH := $(call my-dir)
ifeq ($(TARGET_DEVICE),devon)
-$(call add-radio-file-sha1-checked,radio/bluetooth.img,110029931494e95979159d37c67412a2e4c3fafc)
-$(call add-radio-file-sha1-checked,radio/modem.img,7667ce855cce1826899122719e52d889445de9eb)
-$(call add-radio-file-sha1-checked,radio/abl.img,7fffd62631a674e9a1cf0d9ebd140b81b0c4825c)
-$(call add-radio-file-sha1-checked,radio/devcfg.img,7300e130cd0444e2fcff87bc35bbae7720209c81)
+$(call add-radio-file-sha1-checked,radio/bluetooth.img,deb96def32c07b378e1f92e9717fc4a9bcfad85a)
+$(call add-radio-file-sha1-checked,radio/modem.img,27b1624e1f058dadd683fa49c4eb866ca20b911c)
+$(call add-radio-file-sha1-checked,radio/abl.img,7a05bf37391c5267227e3cf8da4c285822fc3ca8)
+$(call add-radio-file-sha1-checked,radio/devcfg.img,af4002aaf2263724e5937e3cb5a6a90ed304b8e6)
$(call add-radio-file-sha1-checked,radio/dsp.img,a6eccd278e8409e05337ffd6c11e593e8e2944a5)
$(call add-radio-file-sha1-checked,radio/fsg.img,92106a524eaf0111539a23a8f39379a0fd35a477)
-$(call add-radio-file-sha1-checked,radio/hyp.img,3fbf54241fc1ffec29b2b34d461851d233b2db83)
-$(call add-radio-file-sha1-checked,radio/keymaster.img,9c9e102bbc86ef62f2f0a8daac8cd6ddec9727fa)
-$(call add-radio-file-sha1-checked,radio/logo.img,d42625b1cca2a0e867f0b50c5472ebc3410046d2)
-$(call add-radio-file-sha1-checked,radio/prov.img,52ceda1f9df247c8e0a9eb11a82fcfad10b42f3c)
-$(call add-radio-file-sha1-checked,radio/qupfw.img,0856761572c1a173e983e4b4ef77018ce28b202b)
-$(call add-radio-file-sha1-checked,radio/rpm.img,bc6d177f3614cc60c4d2b1001c8e3d106a4061a4)
-$(call add-radio-file-sha1-checked,radio/storsec.img,8c763cc0433c4ae851839844ec30d5aa88aa49e6)
-$(call add-radio-file-sha1-checked,radio/tz.img,7a44835a2705ba331ba55d647e89e69be471b193)
-$(call add-radio-file-sha1-checked,radio/uefisecapp.img,9e2d2dd147b2f78a1ccf15ff67930468cd8c124e)
-$(call add-radio-file-sha1-checked,radio/xbl.img,e01b38c5de440b70b437bc3ab9ec9543514714f0)
-$(call add-radio-file-sha1-checked,radio/xbl_config.img,7849de25d5525f06f4fbebc52935656364f35722)
+$(call add-radio-file-sha1-checked,radio/hyp.img,24c16c52255ccf2a1dbc6771209cda23e4f57b73)
+$(call add-radio-file-sha1-checked,radio/keymaster.img,da5649c00cf6262f34827267c43aab6652760f3a)
+$(call add-radio-file-sha1-checked,radio/logo.img,f7a7192810307adc2a508bbdf6d1b0f9389e1152)
+$(call add-radio-file-sha1-checked,radio/prov.img,24099d1a84b932e3931fa532b0ed45eab76d3363)
+$(call add-radio-file-sha1-checked,radio/qupfw.img,d9a9d55e411ee94c6be4f389439d191f40f6f477)
+$(call add-radio-file-sha1-checked,radio/rpm.img,017749af230befbaa9ede993304384d06bfdcb56)
+$(call add-radio-file-sha1-checked,radio/storsec.img,d4e93ecd473b22601598f5e3271c4f562396086e)
+$(call add-radio-file-sha1-checked,radio/tz.img,04d0147e230880db7011e19e8294d6e2fc13c315)
+$(call add-radio-file-sha1-checked,radio/uefisecapp.img,66f9541a617b26ca2bc9e453311ca2298bcea323)
+$(call add-radio-file-sha1-checked,radio/xbl.img,b07be3419c9dc844ed8c0690b1019141f5add4d5)
+$(call add-radio-file-sha1-checked,radio/xbl_config.img,512d0f479fd4dd65e48e9dad2b64cf5434289752)
endif
diff --git a/proprietary/product/etc/CarrierSettings/s310280gid1_3d_62ff.pb b/proprietary/product/etc/CarrierSettings/s310280gid1_3d_62ff.pb
index 1628897d..6dcf6e95 100644
Binary files a/proprietary/product/etc/CarrierSettings/s310280gid1_3d_62ff.pb and b/proprietary/product/etc/CarrierSettings/s310280gid1_3d_62ff.pb differ
diff --git a/proprietary/product/etc/CarrierSettings/s310410gid1_3d_62ff.pb b/proprietary/product/etc/CarrierSettings/s310410gid1_3d_62ff.pb
index 9b0fc688..64c507f0 100644
Binary files a/proprietary/product/etc/CarrierSettings/s310410gid1_3d_62ff.pb and b/proprietary/product/etc/CarrierSettings/s310410gid1_3d_62ff.pb differ
diff --git a/proprietary/product/etc/CarrierSettings/s310950gid1_3d_62ff.pb b/proprietary/product/etc/CarrierSettings/s310950gid1_3d_62ff.pb
index ca486fb3..761354a1 100644
Binary files a/proprietary/product/etc/CarrierSettings/s310950gid1_3d_62ff.pb and b/proprietary/product/etc/CarrierSettings/s310950gid1_3d_62ff.pb differ
diff --git a/proprietary/product/etc/CarrierSettings/s311180gid1_3d_62ff.pb b/proprietary/product/etc/CarrierSettings/s311180gid1_3d_62ff.pb
index f7b2677f..2e98c0a8 100644
Binary files a/proprietary/product/etc/CarrierSettings/s311180gid1_3d_62ff.pb and b/proprietary/product/etc/CarrierSettings/s311180gid1_3d_62ff.pb differ
diff --git a/proprietary/vendor/lib64/camera/com.qti.tuned.default.bin b/proprietary/vendor/lib64/camera/com.qti.tuned.default.bin
index f799010b..d3109985 100644
Binary files a/proprietary/vendor/lib64/camera/com.qti.tuned.default.bin and b/proprietary/vendor/lib64/camera/com.qti.tuned.default.bin differ
diff --git a/proprietary/vendor/lib64/camera/com.qti.tuned.mot_devon_hi1634q.bin b/proprietary/vendor/lib64/camera/com.qti.tuned.mot_devon_hi1634q.bin
index 608c2a4f..e7a57f8d 100644
Binary files a/proprietary/vendor/lib64/camera/com.qti.tuned.mot_devon_hi1634q.bin and b/proprietary/vendor/lib64/camera/com.qti.tuned.mot_devon_hi1634q.bin differ
diff --git a/proprietary/vendor/lib64/camera/com.qti.tuned.mot_devon_ov02b10.bin b/proprietary/vendor/lib64/camera/com.qti.tuned.mot_devon_ov02b10.bin
index eeb92830..71c2ceb4 100644
Binary files a/proprietary/vendor/lib64/camera/com.qti.tuned.mot_devon_ov02b10.bin and b/proprietary/vendor/lib64/camera/com.qti.tuned.mot_devon_ov02b10.bin differ
diff --git a/proprietary/vendor/lib64/camera/com.qti.tuned.mot_devon_ov02d10.bin b/proprietary/vendor/lib64/camera/com.qti.tuned.mot_devon_ov02d10.bin
index f884581c..9913c693 100644
Binary files a/proprietary/vendor/lib64/camera/com.qti.tuned.mot_devon_ov02d10.bin and b/proprietary/vendor/lib64/camera/com.qti.tuned.mot_devon_ov02d10.bin differ
diff --git a/proprietary/vendor/lib64/camera/com.qti.tuned.mot_devon_s5k4h7.bin b/proprietary/vendor/lib64/camera/com.qti.tuned.mot_devon_s5k4h7.bin
index 54a87ebd..0cfd1a21 100644
Binary files a/proprietary/vendor/lib64/camera/com.qti.tuned.mot_devon_s5k4h7.bin and b/proprietary/vendor/lib64/camera/com.qti.tuned.mot_devon_s5k4h7.bin differ
diff --git a/proprietary/vendor/lib64/camera/com.qti.tuned.mot_devon_s5kjn1.bin b/proprietary/vendor/lib64/camera/com.qti.tuned.mot_devon_s5kjn1.bin
index 6c691727..2e00b30c 100644
Binary files a/proprietary/vendor/lib64/camera/com.qti.tuned.mot_devon_s5kjn1.bin and b/proprietary/vendor/lib64/camera/com.qti.tuned.mot_devon_s5kjn1.bin differ
diff --git a/proprietary/vendor/lib64/camera/components/com.qti.node.eisv2.so b/proprietary/vendor/lib64/camera/components/com.qti.node.eisv2.so
index f7a749c3..d117be5f 100644
Binary files a/proprietary/vendor/lib64/camera/components/com.qti.node.eisv2.so and b/proprietary/vendor/lib64/camera/components/com.qti.node.eisv2.so differ
diff --git a/proprietary/vendor/lib64/camera/components/com.qti.node.eisv3.so b/proprietary/vendor/lib64/camera/components/com.qti.node.eisv3.so
index 2aea5e98..ce649a38 100644
Binary files a/proprietary/vendor/lib64/camera/components/com.qti.node.eisv3.so and b/proprietary/vendor/lib64/camera/components/com.qti.node.eisv3.so differ
diff --git a/proprietary/vendor/lib64/camera/components/com.qti.node.swaidenoiser.so b/proprietary/vendor/lib64/camera/components/com.qti.node.swaidenoiser.so
index 9e1623bf..2a3e19fc 100644
Binary files a/proprietary/vendor/lib64/camera/components/com.qti.node.swaidenoiser.so and b/proprietary/vendor/lib64/camera/components/com.qti.node.swaidenoiser.so differ
diff --git a/proprietary/vendor/lib64/camera/components/com.qti.node.swlsc.so b/proprietary/vendor/lib64/camera/components/com.qti.node.swlsc.so
index 95de9d50..83a69ae0 100644
Binary files a/proprietary/vendor/lib64/camera/components/com.qti.node.swlsc.so and b/proprietary/vendor/lib64/camera/components/com.qti.node.swlsc.so differ
diff --git a/proprietary/vendor/lib64/camera/components/com.qti.node.swmctf.so b/proprietary/vendor/lib64/camera/components/com.qti.node.swmctf.so
index c9888845..960c0dbc 100644
Binary files a/proprietary/vendor/lib64/camera/components/com.qti.node.swmctf.so and b/proprietary/vendor/lib64/camera/components/com.qti.node.swmctf.so differ
diff --git a/proprietary/vendor/lib64/camera/components/com.qti.node.swmfnr.so b/proprietary/vendor/lib64/camera/components/com.qti.node.swmfnr.so
index fb0d80b1..f35d24ac 100644
Binary files a/proprietary/vendor/lib64/camera/components/com.qti.node.swmfnr.so and b/proprietary/vendor/lib64/camera/components/com.qti.node.swmfnr.so differ
diff --git a/proprietary/vendor/lib64/camera/components/com.qti.stats.aecwrapper.so b/proprietary/vendor/lib64/camera/components/com.qti.stats.aecwrapper.so
index bdf56b0b..f1576e53 100644
Binary files a/proprietary/vendor/lib64/camera/components/com.qti.stats.aecwrapper.so and b/proprietary/vendor/lib64/camera/components/com.qti.stats.aecwrapper.so differ
diff --git a/proprietary/vendor/lib64/camera/components/com.qti.stats.afwrapper.so b/proprietary/vendor/lib64/camera/components/com.qti.stats.afwrapper.so
index 6e93a756..eb62ae93 100644
Binary files a/proprietary/vendor/lib64/camera/components/com.qti.stats.afwrapper.so and b/proprietary/vendor/lib64/camera/components/com.qti.stats.afwrapper.so differ
diff --git a/proprietary/vendor/lib64/camera/components/com.qti.stats.awbwrapper.so b/proprietary/vendor/lib64/camera/components/com.qti.stats.awbwrapper.so
index f8efeb92..4f8b3820 100644
Binary files a/proprietary/vendor/lib64/camera/components/com.qti.stats.awbwrapper.so and b/proprietary/vendor/lib64/camera/components/com.qti.stats.awbwrapper.so differ
diff --git a/proprietary/vendor/lib64/camera/components/com.qtistatic.stats.aec.so b/proprietary/vendor/lib64/camera/components/com.qtistatic.stats.aec.so
index 1b2ebfa1..2d0db05d 100644
Binary files a/proprietary/vendor/lib64/camera/components/com.qtistatic.stats.aec.so and b/proprietary/vendor/lib64/camera/components/com.qtistatic.stats.aec.so differ
diff --git a/proprietary/vendor/lib64/camera/components/com.qtistatic.stats.af.so b/proprietary/vendor/lib64/camera/components/com.qtistatic.stats.af.so
index 24463e70..35d296e9 100644
Binary files a/proprietary/vendor/lib64/camera/components/com.qtistatic.stats.af.so and b/proprietary/vendor/lib64/camera/components/com.qtistatic.stats.af.so differ
diff --git a/proprietary/vendor/lib64/camera/components/com.qtistatic.stats.awb.so b/proprietary/vendor/lib64/camera/components/com.qtistatic.stats.awb.so
index 107282b7..6fca004f 100644
Binary files a/proprietary/vendor/lib64/camera/components/com.qtistatic.stats.awb.so and b/proprietary/vendor/lib64/camera/components/com.qtistatic.stats.awb.so differ
diff --git a/proprietary/vendor/lib64/camera/components/com.qtistatic.stats.pdlib.so b/proprietary/vendor/lib64/camera/components/com.qtistatic.stats.pdlib.so
index 10c32f63..89dca678 100644
Binary files a/proprietary/vendor/lib64/camera/components/com.qtistatic.stats.pdlib.so and b/proprietary/vendor/lib64/camera/components/com.qtistatic.stats.pdlib.so differ
diff --git a/proprietary/vendor/lib64/camera/components/com.vidhance.stats.aec_dmbr.so b/proprietary/vendor/lib64/camera/components/com.vidhance.stats.aec_dmbr.so
index a7fd2823..792f5f74 100644
Binary files a/proprietary/vendor/lib64/camera/components/com.vidhance.stats.aec_dmbr.so and b/proprietary/vendor/lib64/camera/components/com.vidhance.stats.aec_dmbr.so differ
diff --git a/proprietary/vendor/lib64/hw/camera.qcom.so b/proprietary/vendor/lib64/hw/camera.qcom.so
index d69de7f7..209c0d3e 100644
Binary files a/proprietary/vendor/lib64/hw/camera.qcom.so and b/proprietary/vendor/lib64/hw/camera.qcom.so differ
diff --git a/radio/abl.img b/radio/abl.img
index f317cb8e..e8022776 100644
--- a/radio/abl.img
+++ b/radio/abl.img
@@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
-oid sha256:db2530715652440350e76d25a427db508694bf6cb6fda7601a722d3d4e8fa7d1
+oid sha256:2393ea3ff8d325e898002817fef4236e55d688c20b8221c4e7aa5a8be107aa0f
size 339968
diff --git a/radio/bluetooth.img b/radio/bluetooth.img
index 0cf6f2f3..b5660d13 100644
--- a/radio/bluetooth.img
+++ b/radio/bluetooth.img
@@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
-oid sha256:89adb539b0d61cfe9113e0a4336e81af0f02ebf9c9f0f28597f33c60c0521a0a
+oid sha256:95782366be25701d1a1cfad5a3ff2e910964d8acc7578394f0e70f9c4c7a89d7
size 1048576
diff --git a/radio/devcfg.img b/radio/devcfg.img
index bb3756c4..e6196538 100644
--- a/radio/devcfg.img
+++ b/radio/devcfg.img
@@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
-oid sha256:3e2872b00e0453b16f65c6ef19fdb6e897f84274fd76808d265bd0a7818bc529
+oid sha256:d722e4a9061b698178724868110f303302488ce898c4d9d1eb84ea5b5579bbd5
size 126080
diff --git a/radio/hyp.img b/radio/hyp.img
index 8484dfcc..14e1f4ba 100644
--- a/radio/hyp.img
+++ b/radio/hyp.img
@@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
-oid sha256:f325986893039baefaface5213f065595c8f7e34c0e13d2b0bfb053c659ac926
+oid sha256:754b14f29989a21eb8d05100cec2f5cc80165234f7b2ecc8b33e9b3a17890633
size 519296
diff --git a/radio/keymaster.img b/radio/keymaster.img
index a5a2ab4f..e2fc5c6f 100644
--- a/radio/keymaster.img
+++ b/radio/keymaster.img
@@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
-oid sha256:dd7563c083175e1e38777caea40aca3eff2e857ef04a2950c2a23da7c9374318
+oid sha256:8f5001bcc4bea1cf7a3d519d0e6665099252f6bcf63c7e21f5d598a2c530e352
size 519296
diff --git a/radio/logo.img b/radio/logo.img
index 97cafea8..9dc281a0 100644
--- a/radio/logo.img
+++ b/radio/logo.img
@@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
-oid sha256:f52d49159fe7df612b5a935e9048637acc7bff3a7a0760aea4aed27b6f4ec431
+oid sha256:d94a826b2d78f959ec0d51594d505731213df42899908076ce7c967ff9dd9a9d
size 10797056
diff --git a/radio/modem.img b/radio/modem.img
index d0d5dca4..06a1862f 100644
--- a/radio/modem.img
+++ b/radio/modem.img
@@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
-oid sha256:2cc3554eceb5213923ed8bf4f12f2e5c1af72a8284f3ffde046c2d9863ed9443
+oid sha256:fa41dea0c5dd271da5f3c0dc51ce38a6aa575faaf8d5655b0d45e26eba0aafa2
size 188743680
diff --git a/radio/prov.img b/radio/prov.img
index 9ff4e6fc..1ec8cf00 100644
--- a/radio/prov.img
+++ b/radio/prov.img
@@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
-oid sha256:61886e28bbe205d8f1c7fd91aea93fb05125262adc6e4ef1a1c7606cc4a7c7bc
+oid sha256:688c317a6f7f2d4e074251bfb2a582e0273b0b4226e64dc784b15246ae89316d
size 257152
diff --git a/radio/qupfw.img b/radio/qupfw.img
index 6872dafe..4f22e253 100644
--- a/radio/qupfw.img
+++ b/radio/qupfw.img
@@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
-oid sha256:f20a02837f77c8a25ec0a7466a1f75c1d7c5019abdccdc608008ab0c2e3ed2de
+oid sha256:4884e62e72a7dcb7801c69febdd60b7ba08f393ba01fb68f8bd199e9dc4e318b
size 76928
diff --git a/radio/rpm.img b/radio/rpm.img
index e6b08f15..abeda818 100644
--- a/radio/rpm.img
+++ b/radio/rpm.img
@@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
-oid sha256:33871b066de926b90520008b0e2cb213a78a244ee6fc701cc2c4d3915f4a12c7
+oid sha256:fd36e98b259fb4ef587590afe953d0ad50ab8d2b376c75f660c2bf89706b7710
size 519296
diff --git a/radio/storsec.img b/radio/storsec.img
index ad51024b..4f9fd3be 100644
--- a/radio/storsec.img
+++ b/radio/storsec.img
@@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
-oid sha256:9ae795ae81045698c18dd65ac629d877793003490c74725880d0f84e47e05183
+oid sha256:b77990d55b51f2cc30f5f27dfdadcb5685e8ecb5f431faab69a43ae1be5d0340
size 126080
diff --git a/radio/tz.img b/radio/tz.img
index f8569bf8..04fb5d37 100644
--- a/radio/tz.img
+++ b/radio/tz.img
@@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
-oid sha256:0d898aa015ef5d6f171ae0696f6f6318d4902ffd029b8b00433cf7f6ed0b12e8
+oid sha256:207a883064d9ca702aadeb108463e6f57fb57dd814b5c6b64159b4709efd73e0
size 4189312
diff --git a/radio/uefisecapp.img b/radio/uefisecapp.img
index 1bc89d3e..8f2bcb87 100644
--- a/radio/uefisecapp.img
+++ b/radio/uefisecapp.img
@@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
-oid sha256:8c5b645131c8fb6f208102427a4e006612249bca124959a37aa9ddd985408f75
+oid sha256:3a95231b557938343439f20f66d920262d4921161cfc4e8fbeb90865e747fdc8
size 2092160
diff --git a/radio/xbl.img b/radio/xbl.img
index 05d9f307..c53d09ce 100644
--- a/radio/xbl.img
+++ b/radio/xbl.img
@@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
-oid sha256:3aeb000354357f0f7e58204cdc8ac9ce54818e02560cc33c59ebe3912b7561ee
+oid sha256:96532dbecf79ff9a2470f3ef9e2067f8b207b9d18f9e93ab35c88c9c498a2290
size 5237888
diff --git a/radio/xbl_config.img b/radio/xbl_config.img
index 889bf43a..099876b9 100644
--- a/radio/xbl_config.img
+++ b/radio/xbl_config.img
@@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
-oid sha256:68fd2a6467d6afb6f82f8822fb723b7b0467b734cc8b4420db9c07337f8fde3e
+oid sha256:534803f5af0fffb12ea096342163c25655e6351242b3abacb72b865483683f1d
size 257152
diff --git a/rro_overlays/CarrierConfigOverlay/res/xml/vendor.xml b/rro_overlays/CarrierConfigOverlay/res/xml/vendor.xml
index e5e2203e..93a2d4fc 100644
--- a/rro_overlays/CarrierConfigOverlay/res/xml/vendor.xml
+++ b/rro_overlays/CarrierConfigOverlay/res/xml/vendor.xml
@@ -54914,6 +54914,7 @@