diff --git a/Android.mk b/Android.mk
index 1bcb6f32..31959ef2 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/abl.img,dce97a77222c1e7a2e2bed156dc5f58f4061fde1)
-$(call add-radio-file-sha1-checked,radio/bluetooth.img,8a60a5f59d5ee8f19844e2cd1a336dacef7b1d0a)
-$(call add-radio-file-sha1-checked,radio/devcfg.img,1249f7903986b6c4a0f865f056e8c51dc6dc4225)
+$(call add-radio-file-sha1-checked,radio/abl.img,548c2573f961932854a9dcf9ed43f35c386a199a)
+$(call add-radio-file-sha1-checked,radio/bluetooth.img,5f4bcdc958ecfa53dc98cf74c6ee0815c5b8c48b)
+$(call add-radio-file-sha1-checked,radio/devcfg.img,1af5fcf290be7bca04cfc332fa67556882334484)
$(call add-radio-file-sha1-checked,radio/dsp.img,4144ffeb26921b1051bc4978024a19bcadc2cc03)
$(call add-radio-file-sha1-checked,radio/fsg.img,92106a524eaf0111539a23a8f39379a0fd35a477)
-$(call add-radio-file-sha1-checked,radio/hyp.img,7e16098138506353be39247ea60b30ed7c0bb66f)
-$(call add-radio-file-sha1-checked,radio/keymaster.img,6c05d19a42e1588fe03fc41010afd7bd8eb5e5db)
-$(call add-radio-file-sha1-checked,radio/logo.img,3d1399b89c975aee1ac10ec6c671dccf09c7657f)
-$(call add-radio-file-sha1-checked,radio/modem.img,ea6de364e77a3feb68a85b48b358d157956f68cb)
-$(call add-radio-file-sha1-checked,radio/prov.img,50a662f6176ec33e13d63031bd2f1e96a25f604c)
-$(call add-radio-file-sha1-checked,radio/qupfw.img,4415d9555943054b100746fc4c6aff5a815858eb)
-$(call add-radio-file-sha1-checked,radio/rpm.img,23ee4e224a8f4182c7847fb67f3563cb4438f121)
-$(call add-radio-file-sha1-checked,radio/storsec.img,8ead4bcd6a373acc285d0daf2da686276c0a5431)
-$(call add-radio-file-sha1-checked,radio/tz.img,194b306e5ce5c598ef1c9b965e068980cab6c06e)
-$(call add-radio-file-sha1-checked,radio/uefisecapp.img,f14631195614286327aaccaac0178aef1aa7854c)
-$(call add-radio-file-sha1-checked,radio/xbl.img,5de085fa54739a579d657c080285542aa6025b08)
-$(call add-radio-file-sha1-checked,radio/xbl_config.img,fc1f7fa3f81cde7574269f22405ecbaab0309e30)
+$(call add-radio-file-sha1-checked,radio/hyp.img,f2c543592b8096d6222d44dc80b3a1046307da13)
+$(call add-radio-file-sha1-checked,radio/keymaster.img,55402731fe831b39ca65bfc009ee8f47f2eca4b2)
+$(call add-radio-file-sha1-checked,radio/logo.img,fff3eed6a4a3009ab4b909051cacdc000a3c1710)
+$(call add-radio-file-sha1-checked,radio/modem.img,772ddd530bbcf2b6a7f664533362f5ef81257bf4)
+$(call add-radio-file-sha1-checked,radio/prov.img,2f71f9ec5adbc9d93f582b2733bab0b08e7020ee)
+$(call add-radio-file-sha1-checked,radio/qupfw.img,0d4e7547bb757cfed36c447e1200d7cb6e819c79)
+$(call add-radio-file-sha1-checked,radio/rpm.img,05766801fcf42cadcf7d7335bce3b0d78c3be502)
+$(call add-radio-file-sha1-checked,radio/storsec.img,31e904086ea5c97cf8024a8c41f267dbb3d41dc7)
+$(call add-radio-file-sha1-checked,radio/tz.img,29f4c9063d07252be1084e6dcd0cac7a8870cfa5)
+$(call add-radio-file-sha1-checked,radio/uefisecapp.img,74822f4b17dd036b936aa198bd7f5c205b19ade3)
+$(call add-radio-file-sha1-checked,radio/xbl.img,2093973ed23bfec31d120ec02da287d6a16a6e0b)
+$(call add-radio-file-sha1-checked,radio/xbl_config.img,6c9ed928c005026f5ecaae318fb37a35ee83f765)
endif
diff --git a/proprietary/product/etc/CarrierSettings/s310280gid1_3d_62ff.pb b/proprietary/product/etc/CarrierSettings/s310280gid1_3d_62ff.pb
index 6dcf6e95..1628897d 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 64c507f0..9b0fc688 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 761354a1..ca486fb3 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 2e98c0a8..f7b2677f 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 94752d0f..3cc7a46d 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 54bcd591..73fb045c 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 e66ce321..d080ada9 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 4f68db84..7914a897 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 a5df3d02..affbe648 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 e9b2aca5..9142dc84 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 ea695599..6c5c9506 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 5b145ee1..3476b2eb 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 db34be40..bea8cda4 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 536e3395..7f6478cb 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 e6abe40b..2670f219 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 4d12870d..f2bd5209 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 2c1e888a..221979db 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 b36a3dc1..32001288 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 a9b53ee9..0ebbf70e 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 d8fc3a49..545c1869 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 ea3d6307..cdbdb56a 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 86f64960..729a58f8 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 13940615..9d7c3f86 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 f9a27248..a5fe592a 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 ef1bf608..b894f4c7 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 2a27fe1c..5c4bd3e6 100644
--- a/radio/abl.img
+++ b/radio/abl.img
@@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
-oid sha256:63bf158604161a65dde4c548eb0a02f9aea4aae4f0042d2ddc9f394f53b4dddf
+oid sha256:b4f437b3eb19d012dcadfaababfad044126e4708cca0f2cde16e2a7ed4e10122
size 339968
diff --git a/radio/bluetooth.img b/radio/bluetooth.img
index c0e2f2e9..75c4b23c 100644
--- a/radio/bluetooth.img
+++ b/radio/bluetooth.img
@@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
-oid sha256:c57c7d850ec34ba0770933a64ca75e0cbec7c48113cc43d0873c4cc63fa70ecf
+oid sha256:83dfe8e8b6667b3bcd82752fef323c9d786cab1988adec6286887ebbdca7204d
size 811084
diff --git a/radio/devcfg.img b/radio/devcfg.img
index 92e0b6bb..9bf06829 100644
--- a/radio/devcfg.img
+++ b/radio/devcfg.img
@@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
-oid sha256:5604897d5779da011391e37e3e24cb2883eb3791393fe95e5f73668acfbbf54e
+oid sha256:4ce461644b23ed5588d40da181676dd19d8822e12e8fd5f41c062571160bb32c
size 126080
diff --git a/radio/hyp.img b/radio/hyp.img
index 25b55466..106f23dd 100644
--- a/radio/hyp.img
+++ b/radio/hyp.img
@@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
-oid sha256:868a6d4cf129ac574879ecc55ad285a524db1664d92183dc7df9e3c04c35fb42
+oid sha256:f44ff74f1c73b1f998e232ab6910fbc2d76311af903d6b94d05edb53616a07f5
size 519296
diff --git a/radio/keymaster.img b/radio/keymaster.img
index 71e296a9..1f8f2c53 100644
--- a/radio/keymaster.img
+++ b/radio/keymaster.img
@@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
-oid sha256:91779e774b6c2bb6109971e5177b30fb96bea0ae0402a3d1fc8911769079fa6d
+oid sha256:07c2924b7ef5a957d7544fb5c3b5c913c41e554e3266ba14962911edcef7381a
size 519296
diff --git a/radio/logo.img b/radio/logo.img
index 7baea9c2..a3eb25e8 100644
--- a/radio/logo.img
+++ b/radio/logo.img
@@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
-oid sha256:6492cd933f240c9ff9d30d1b082b6325899bad5cc14149ba0a92e0edaf49a6ff
+oid sha256:1cde4e568453cd3898420c6444729aa107faede0657f05a99002d9570bec0c18
size 10797056
diff --git a/radio/modem.img b/radio/modem.img
index ccebcdda..1d88c2d6 100644
--- a/radio/modem.img
+++ b/radio/modem.img
@@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
-oid sha256:fdbe329e64f352eaacccddddcdb26ea30bd027c3a6d513fd1da0e47f6426b5c5
+oid sha256:14099644bd8c7d89a1ac24ca03012beb1098329320559085ab84a5eb55e1e41b
size 77353072
diff --git a/radio/prov.img b/radio/prov.img
index 4d0f0ffe..459813d2 100644
--- a/radio/prov.img
+++ b/radio/prov.img
@@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
-oid sha256:15467402c33de4bed6310e40ddf7b70536c6f228dfc7567da03d67297a3777d0
+oid sha256:789218fbf85af49e41a7e37fc44c2fc41b74fbd306bb938ce535b31a4a958850
size 257152
diff --git a/radio/qupfw.img b/radio/qupfw.img
index 57dcf782..6c9e904e 100644
--- a/radio/qupfw.img
+++ b/radio/qupfw.img
@@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
-oid sha256:7ca8c51a0e7cd9445c7fec0e5783b48fd9125353839f03184ef7d6ee36289e49
+oid sha256:582f2a7aa36c5ce60ee38a0af2f0667c846095c8164f9f82bf1a446d132dd879
size 76928
diff --git a/radio/rpm.img b/radio/rpm.img
index 7727187a..e8e7e423 100644
--- a/radio/rpm.img
+++ b/radio/rpm.img
@@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
-oid sha256:1fe4b268de97d3a32daed5417d6cd2b9d800949aabe58264f4fbe5768dde8437
+oid sha256:26cbde1bddcd5aab7a1743055e479eb69b13d529ead8de52aaa14a46ecb3ae49
size 519296
diff --git a/radio/storsec.img b/radio/storsec.img
index 5c0c3fa8..80289283 100644
--- a/radio/storsec.img
+++ b/radio/storsec.img
@@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
-oid sha256:5d2cb4e4f2339e7b43e035d6f82bef349913276eb4a8abcf094fc02c85458bc2
+oid sha256:5bb6917940f0e5fe2b498a3ca9dedba7bd9631c9783b187953268b1b54506a38
size 126080
diff --git a/radio/tz.img b/radio/tz.img
index 6daf9896..d7fd4361 100644
--- a/radio/tz.img
+++ b/radio/tz.img
@@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
-oid sha256:85f7e3ce76d2e8aa216456f3e3c04dc19a5e984f3348b8cbf0c6b7c03bf9a1b9
+oid sha256:a4b6c316e37ffaa07dc5f8480f89be5abfb2544308085e256e693587092a37fa
size 4189312
diff --git a/radio/uefisecapp.img b/radio/uefisecapp.img
index 7816b8e3..04208f34 100644
--- a/radio/uefisecapp.img
+++ b/radio/uefisecapp.img
@@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
-oid sha256:92c37067e1ea1d699729b948f0719d064838dc31704ef18d1d7d0f4c04f03dd9
+oid sha256:08c91874a01761a3c340b4c2431c24d0ea68c965b877068c030982bb4a18c869
size 2092160
diff --git a/radio/xbl.img b/radio/xbl.img
index 46ee5671..11933f36 100644
--- a/radio/xbl.img
+++ b/radio/xbl.img
@@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
-oid sha256:92d304d8cd7284a6b8c51663485aa6f9da47ff3d1646b78a14b6ba4ea013c7ad
+oid sha256:c93464f33801f0580e67e4a8946099ee11f345d1aafc96e18857caffa8366a3d
size 5237888
diff --git a/radio/xbl_config.img b/radio/xbl_config.img
index fbf9f01f..edd17d1b 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:194218dadb8a720590f2ba6c618565d0047cefc5ad1a706b3c22097248f8a68c
+oid sha256:1caa724100821cf2e60c6c514759ef8540abe7f71cb570de71b04863f2155288
size 257152
diff --git a/rro_overlays/CarrierConfigOverlay/res/xml/vendor.xml b/rro_overlays/CarrierConfigOverlay/res/xml/vendor.xml
index 93a2d4fc..e5e2203e 100644
--- a/rro_overlays/CarrierConfigOverlay/res/xml/vendor.xml
+++ b/rro_overlays/CarrierConfigOverlay/res/xml/vendor.xml
@@ -54914,7 +54914,6 @@