diff --git a/BoardConfig.mk b/BoardConfig.mk
index c634ba5..11a5bae 100644
--- a/BoardConfig.mk
+++ b/BoardConfig.mk
@@ -102,7 +102,7 @@ MAX_EGL_CACHE_KEY_SIZE := 12*1024
 MAX_EGL_CACHE_SIZE := 2048*1024
 
 # Assert
-TARGET_OTA_ASSERT_DEVICE := kltexx,kltespr,kltetmo,kltecan,klteatt,kltevzw,klteusc,kltedv,klteub,klte
+TARGET_OTA_ASSERT_DEVICE := kltexx,kltespr,kltetmo,kltecan,klteatt,kltevzw,klteusc,kltedv,klteub,klteacg,klte
 
 # PowerHAL
 TARGET_POWERHAL_VARIANT := qcom
diff --git a/init/init_klte.c b/init/init_klte.c
index 6d111ab..f1315c6 100755
--- a/init/init_klte.c
+++ b/init/init_klte.c
@@ -95,6 +95,20 @@ void init_msm_properties(unsigned long msm_id, unsigned long msm_ver, char *boar
         property_set("ro.product.model", "SM-G900M");
         property_set("ro.product.device", "klteub");
 	gsm_properties();
+    } else if (strstr(bootloader, "G900A")) {
+        /* klteatt */
+        property_set("ro.build.fingerprint", "samsung/klteatt/klte:4.4.2/KOT49H/G900AUCU2AND3:user/release-keys");
+        property_set("ro.build.description", "klteatt-user 4.4.2 KOT49H G900AUCU2AND3 release-keys");
+        property_set("ro.product.model", "SM-G900A");
+        property_set("ro.product.device", "klteatt");
+	gsm_properties();
+    } else if (strstr(bootloader, "G900R7")) {
+        /* klteacg */
+        property_set("ro.build.fingerprint", "samsung/klteacg/klteacg:4.4.2/KOT49H/G900R7WWU2AND8:user/release-keys");
+        property_set("ro.build.description", "klteacg-user 4.4.2 KOT49H G900R7WWU2AND8 release-keys");
+        property_set("ro.product.model", "SM-G900P");
+        property_set("ro.product.device", "kltespr");
+        cdma_properties();
     } else if (strstr(bootloader, "G900V")) {
         /* hltevzw */
         property_set("ro.build.fingerprint", "Verizon/kltevzw/kltevzw:4.4.2/KOT49H/G900VVRU1ANCG:user/release-keys");
diff --git a/releasetools.py b/releasetools.py
index 4fd90df..e618c29 100644
--- a/releasetools.py
+++ b/releasetools.py
@@ -17,6 +17,7 @@
 """Custom OTA commands for klte devices"""
 
 def FullOTA_InstallEnd(info):
+  info.script.AppendExtra('ifelse(is_substring("G900A", getprop("ro.bootloader")), run_program("/sbin/sh", "-c", "busybox cp /system/lib/gsm/* /system/lib/"));')
   info.script.AppendExtra('ifelse(is_substring("G900T", getprop("ro.bootloader")), run_program("/sbin/sh", "-c", "busybox cp /system/lib/gsm/* /system/lib/"));')
   info.script.AppendExtra('ifelse(is_substring("G9005", getprop("ro.bootloader")), run_program("/sbin/sh", "-c", "busybox cp /system/lib/gsm/* /system/lib/"));')
   info.script.AppendExtra('ifelse(is_substring("G900F", getprop("ro.bootloader")), run_program("/sbin/sh", "-c", "busybox cp /system/lib/gsm/* /system/lib/"));')
@@ -26,5 +27,7 @@ def FullOTA_InstallEnd(info):
   info.script.AppendExtra('ifelse(is_substring("G900V", getprop("ro.bootloader")), run_program("/sbin/sh", "-c", "busybox cp /system/lib/cdma/* /system/lib/"));')
   info.script.AppendExtra('ifelse(is_substring("G900P", getprop("ro.bootloader")), run_program("/sbin/sh", "-c", "busybox cp /system/lib/cdma/* /system/lib/"));')
   info.script.AppendExtra('ifelse(is_substring("G900R4", getprop("ro.bootloader")), run_program("/sbin/sh", "-c", "busybox cp /system/lib/cdma/* /system/lib/"));')
+  info.script.AppendExtra('ifelse(is_substring("G900R6", getprop("ro.bootloader")), run_program("/sbin/sh", "-c", "busybox cp /system/lib/cdma/* /system/lib/"));')
+  info.script.AppendExtra('ifelse(is_substring("G900R7", getprop("ro.bootloader")), run_program("/sbin/sh", "-c", "busybox cp /system/lib/cdma/* /system/lib/"));')
   info.script.AppendExtra('delete_recursive("/system/lib/gsm/");')
   info.script.AppendExtra('delete_recursive("/system/lib/cdma/");')
diff --git a/system.prop b/system.prop
index b3d4128..9a4d670 100644
--- a/system.prop
+++ b/system.prop
@@ -2,7 +2,7 @@ rild.libargs=-d /dev/smd0
 
 ro.qc.sdk.izat.premium_enabled=0
 ro.qc.sdk.izat.service_mask=0x0
-persist.gps.qc_nlp_in_use=0
+persist.gps.qc_nlp_in_use=1
 ro.gps.agps_provider=1
 ro.qualcomm.cabl=1
 ro.hdcp2.rx=tz
@@ -10,7 +10,7 @@ ro.secwvk=144
 debug.sensors=1
 
 # Audio configuration
-ro.qc.sdk.audio.fluencetype=fluence
+ro.qc.sdk.audio.fluencetype=none
 persist.audio.fluence.voicecall=true
 persist.audio.fluence.voicerec=false
 persist.audio.fluence.speaker=true
@@ -20,3 +20,21 @@ qcom.hw.aac.encoder=true
 
 # System property for number of mQANElements
 ro.ril.telephony.mqanelements=6
+
+# VIDC: debug_levels
+# 1:ERROR 2:HIGH 4:LOW 0:NOLOGS 7:AllLOGS
+vidc.debug.level=7
+ro.qc.sdk.audio.ssr=false
+ro.qc.sdk.sensors.gestures=true
+ro.qc.sdk.gestures.camera=false
+ro.qc.sdk.camera.facialproc=false
+#property to enable user to access Google WFD settings.
+persist.debug.wfd.enable=1
+#property to choose between virtual/external wfd display
+persist.sys.wfd.virtual=0
+tunnel.audio.encode = true
+#use VERY_HIGH_QUALITY for audio resampler
+af.resampler.quality=4
+# set wakeup status and svoice status
+persist.audio.voice_wakeup=0
+