diff --git a/Android.bp b/Android.bp
index 0dd5ddb0..c0bbad5e 100644
--- a/Android.bp
+++ b/Android.bp
@@ -3,6 +3,9 @@
 // This file is generated by device/motorola/devon/setup-makefiles.sh
 
 soong_namespace {
+	imports: [
+		"vendor/motorola/sm6225-common",
+	],
 }
 
 cc_prebuilt_library_shared {
diff --git a/Android.mk b/Android.mk
index 4ff95225..235cd86d 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,6cae44c07a93c5198f8a3750f726879442f4297f)
-$(call add-radio-file-sha1-checked,radio/modem.img,75b0f9938ba8c4457c8126a37f0204ac95b98434)
-$(call add-radio-file-sha1-checked,radio/abl.img,cdda66fe053fc2bf5ea7026f4b37d3c361e8e8b6)
-$(call add-radio-file-sha1-checked,radio/devcfg.img,5121d654de5e2ba009a13e4ae8d0367d8ff84fa7)
+$(call add-radio-file-sha1-checked,radio/bluetooth.img,05bf057f2ef764ca62c6410bce7678c112ebfc16)
+$(call add-radio-file-sha1-checked,radio/modem.img,0d5e959e0869ca5b3c9998591e066601a5933f89)
+$(call add-radio-file-sha1-checked,radio/abl.img,a788af792b23ad06accf9b4db3647cd0d174f8ac)
+$(call add-radio-file-sha1-checked,radio/devcfg.img,40ccf81add04737d0ecb14c168190f5bb63f6108)
 $(call add-radio-file-sha1-checked,radio/dsp.img,e696f95a5b672f1b1355745ca05840b098cb6775)
 $(call add-radio-file-sha1-checked,radio/fsg.img,619cd6452b77e09a28ec2d30a37f41e76a807ecc)
-$(call add-radio-file-sha1-checked,radio/hyp.img,f28d1568a8c91d831c5b12fe7fea194c65f3c187)
-$(call add-radio-file-sha1-checked,radio/keymaster.img,0f2a860473f8d408d7b881853a1463a095994bef)
-$(call add-radio-file-sha1-checked,radio/logo.img,01f70563e6166bf50e7f6e5ca4c56abedbca4a31)
-$(call add-radio-file-sha1-checked,radio/prov.img,db7c8382c8e7d1107dd49841abb0c47614fdf591)
-$(call add-radio-file-sha1-checked,radio/qupfw.img,5f93365d48e70602ac0d0a4b6fc2ffc3d7e66dfb)
-$(call add-radio-file-sha1-checked,radio/rpm.img,385ebf3fb0ce819464198a394d5b32f24327cbe7)
-$(call add-radio-file-sha1-checked,radio/storsec.img,98e05ab3582d8a29b76c40062e9aba19960c8359)
-$(call add-radio-file-sha1-checked,radio/tz.img,5c536771fe8f8ba114ffc6c82208de1921468cd7)
-$(call add-radio-file-sha1-checked,radio/uefisecapp.img,5b99c09d9ed8465c999662aa4e3209604d6f9998)
-$(call add-radio-file-sha1-checked,radio/xbl.img,97b590067a9b089365159ca0d63932bf7a7c3118)
-$(call add-radio-file-sha1-checked,radio/xbl_config.img,d5552b223316ce68b739c993250a419c77cb0fc6)
+$(call add-radio-file-sha1-checked,radio/hyp.img,77daa6e9a25c1a756d3ab8905b6756655afa448b)
+$(call add-radio-file-sha1-checked,radio/keymaster.img,f51a12173f34247ef3d7b4afe371a6807fdf3967)
+$(call add-radio-file-sha1-checked,radio/logo.img,25a2e28e9afe14fa5f3182876b32875cd2b2403a)
+$(call add-radio-file-sha1-checked,radio/prov.img,f3dc635b2d5c55af45c0a77b1afb62587585d894)
+$(call add-radio-file-sha1-checked,radio/qupfw.img,0ba12afc2a336bc1f462acd653a72ceb2d63ab6c)
+$(call add-radio-file-sha1-checked,radio/rpm.img,8156aa41028fedd83f32858d355d1f24d2efce0d)
+$(call add-radio-file-sha1-checked,radio/storsec.img,b43cede859d6660e57baa0e48279dcd38c499c10)
+$(call add-radio-file-sha1-checked,radio/tz.img,f7083bf7ccfb8a5442f9a294fccb936013af6867)
+$(call add-radio-file-sha1-checked,radio/uefisecapp.img,6161b48bba81f19e5c6d0a929f05e1acf840b3f2)
+$(call add-radio-file-sha1-checked,radio/xbl.img,6e55f6c5849b3a1916930cc28d73fef348fa6f42)
+$(call add-radio-file-sha1-checked,radio/xbl_config.img,3f52d34dcee381589f2c0c0920f7ede2ce806ceb)
 
 endif
diff --git a/proprietary/vendor/lib64/camera/com.qti.tuned.default.bin b/proprietary/vendor/lib64/camera/com.qti.tuned.default.bin
index bff3ceab..efc742e2 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 5eec39c5..ed33706e 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 063ec106..7a8806e6 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 7f376d3b..f2f37308 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 f549b01a..794ea610 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 09a79eaf..c77cb6ab 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 9d1ba50d..9b545d1e 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 e715067c..f1397206 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 76ea5daa..9791a598 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 0adbd9c9..8ffd2993 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 c80c613d..fa5ced68 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 7fa888fc..eec4033d 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 4784abab..9ee3bca4 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 87978a85..50fcc233 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 e055aac9..43f657a7 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 d48da640..0e916c18 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 94d0315e..1b604975 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 aa798657..f28be014 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 9f5286f3..415befe6 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 f4f62350..abf6a8a9 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 f6666811..f0758985 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 a49e8321..64708822 100644
--- a/radio/abl.img
+++ b/radio/abl.img
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:09cb9bb6136aee080b4c7c1c7c509f70b41a090cd5b9fe8957ed69f5f64d5744
+oid sha256:30651bb8a5dae878fa860ccdf853c9f28c4c377a130a31dca1462b036f82d64e
 size 339968
diff --git a/radio/bluetooth.img b/radio/bluetooth.img
index e0f63320..b8876437 100644
--- a/radio/bluetooth.img
+++ b/radio/bluetooth.img
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:84c8ba444911fb3c9814ee94ece6f912aa5c0bba4c563f5a7e4acd43f137de25
+oid sha256:3174e396eadcd134f0875aa2275bc7446fdb6ba6f2eecc0e6375b4aca41f4eeb
 size 1048576
diff --git a/radio/devcfg.img b/radio/devcfg.img
index e5fadd70..c1d936c5 100644
--- a/radio/devcfg.img
+++ b/radio/devcfg.img
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:0126fa4d2df27b106f4537a9efce3d31337cd8045bd7ad979361aebb6163dc0e
+oid sha256:e5650adcbcebe10d34e1867d20df628851d9382e96817820790efe3374dd1968
 size 126080
diff --git a/radio/hyp.img b/radio/hyp.img
index 601f6bb8..deacaa9e 100644
--- a/radio/hyp.img
+++ b/radio/hyp.img
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:7d144888acfd35681a7afc09722c093fa67c1fe8acafdd1322d375499a1ff6ed
+oid sha256:178a713d84f029a75e041f90aff66a65039c2b82b1d44e6b0ea69ce139b070d8
 size 519296
diff --git a/radio/keymaster.img b/radio/keymaster.img
index f536c039..782a8944 100644
--- a/radio/keymaster.img
+++ b/radio/keymaster.img
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:c7ac976307e20ce5ae9de1428b6bc87207ff35453f9a6d281f09da5e7a6a78ee
+oid sha256:74b26377d6944584d2a13c02a68b774d65768c97c686500dec078b04dda4f558
 size 519296
diff --git a/radio/logo.img b/radio/logo.img
index d173930a..9e4aa106 100644
--- a/radio/logo.img
+++ b/radio/logo.img
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:0282ea3e023cb6116ed672848844b666984d90f9b0d49070af2149833ed35af6
+oid sha256:a0f0172edc42563a47378256088267c5b0131d12d1722d524c3f9a32093e11af
 size 10797056
diff --git a/radio/modem.img b/radio/modem.img
index eb4d8dbb..674b7e59 100644
--- a/radio/modem.img
+++ b/radio/modem.img
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:2a527bf0f8bd93b684d44c0aa9b8ee0145553321e709b5207351ae0bf0a9805a
+oid sha256:6102e6ef2c2d61a1dcdce6955ada9ddb66ce2b828f5f2cca7feb9eede4a0f71f
 size 188743680
diff --git a/radio/prov.img b/radio/prov.img
index 30b52c0b..e6a085c8 100644
--- a/radio/prov.img
+++ b/radio/prov.img
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:0e347d6f1e05531384d057630824d9f82887af71fdae35d8918642e89c4bda73
+oid sha256:69f4e5a61980b81711aa8eb9ac7d41bda93bd5d1609f9d8453279c51d2bf5a7b
 size 257152
diff --git a/radio/qupfw.img b/radio/qupfw.img
index e82c1192..e926dffa 100644
--- a/radio/qupfw.img
+++ b/radio/qupfw.img
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:5220e5b517f8a6dc9bcf3016e571e7d30971127752907b6a972f597255cdb8e3
+oid sha256:dfb17f02d7b0b3c96454e633342a133f385cdb5733edbf1da6d5c7f39cc76d9a
 size 76928
diff --git a/radio/rpm.img b/radio/rpm.img
index 2d7c16bb..eef95fa7 100644
--- a/radio/rpm.img
+++ b/radio/rpm.img
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:0a7074630fb629ba217a7c30b62cb830e29f41b0362c0798ec03cd94827f3a99
+oid sha256:a19134c9fdc6786a0b0a0406354470af9d29825092a8e789b390e82dfb1fc786
 size 519296
diff --git a/radio/storsec.img b/radio/storsec.img
index d1216504..d3525433 100644
--- a/radio/storsec.img
+++ b/radio/storsec.img
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:ae0ba6798103d65d219085cde1c5434b25dc32fb7fc65140b994ff252b0089a9
+oid sha256:c2a1d103f430f2ee3f636c0821d47ab69777c883ccbb82eb6e2f137a3544b024
 size 126080
diff --git a/radio/tz.img b/radio/tz.img
index 28b32788..f907a8a3 100644
--- a/radio/tz.img
+++ b/radio/tz.img
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:1542eeb900742dd89d17d9d7302ead7b60e19038ec0918c6ba07cb42231b4024
+oid sha256:476fd1c025fea314ac165b937dc08a4039dda76aeccefc1b9d49b19837cf84cc
 size 4189312
diff --git a/radio/uefisecapp.img b/radio/uefisecapp.img
index 25d6b7fa..c9f33cc0 100644
--- a/radio/uefisecapp.img
+++ b/radio/uefisecapp.img
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:66aa6400474dd7c643aaad4c8633abe425d7e0c611083cbc3886f52b3439805b
+oid sha256:521f1ac78e070cb628c5cf279a65fc53ceb2a3b4968ff97dd22168c3a5c58768
 size 2092160
diff --git a/radio/xbl.img b/radio/xbl.img
index 58e9cfdd..f0092020 100644
--- a/radio/xbl.img
+++ b/radio/xbl.img
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:04bb0a40b2e5382f371cc16d8bc6a72de00c3fc710a21552a9466ff0edb2c635
+oid sha256:7e1bea547c9632c4eee63b58eeec9a30f90cf81ad135db11ad4af04ff98928f8
 size 5237888
diff --git a/radio/xbl_config.img b/radio/xbl_config.img
index 0ce5201b..4a5e2529 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:cbd24a8435e82066922504f6d06b1504351bcdb41c2a95421a45362042d1c5a6
+oid sha256:98e5e4f2a9f5f62975602f060688f76cff78afa577882efe15291125892d4c25
 size 257152