diff --git a/overlay/common/frameworks/base/core/res/res/values/config.xml b/overlay/common/frameworks/base/core/res/res/values/config.xml
index 6606ea8..c9e4f67 100644
--- a/overlay/common/frameworks/base/core/res/res/values/config.xml
+++ b/overlay/common/frameworks/base/core/res/res/values/config.xml
@@ -24,7 +24,7 @@
 
     <bool name="config_cellBroadcastAppLinks">true</bool>
 
-    <!-- Disable stock OTA components if installed -->
+    <!-- Disable stock OTA components if installed
     <string-array name="config_disabledComponents" translatable="false">
         <item>com.google.android.gsf/com.google.android.gsf.update.SystemUpdateActivity</item>
         <item>com.google.android.gsf/com.google.android.gsf.update.SystemUpdateService</item>
@@ -34,17 +34,18 @@
         <item>com.google.android.gms/com.google.android.gms.update.SystemUpdateService$Receiver</item>
         <item>com.google.android.gms/com.google.android.gms.update.SystemUpdateService$ActiveReceiver</item>
     </string-array>
+    -->
 
     <string name="config_mms_user_agent">CyanogenMod</string>
     <string name="config_mms_user_agent_profile_url">http://www.google.com/oha/rdf/ua-profile-kila.xml</string>
 
     <!-- Automatic power profile management per app.
          Each item should list the fully-qualified activity
-         name and the power profile id, separated by a comma. -->
+         name and the power profile id, separated by a comma.
     <string-array name="config_auto_perf_activities" translatable="false">
         <item>com.aurorasoftworks.quadrant.*BenchmarkExecutionActivity,2</item>
         <item>com.antutu.ABenchMark.*,2</item>
         <item>.*com.antutu.benchmark.*,2</item>
     </string-array>
-
+  -->
 </resources>
diff --git a/overlay/common/frameworks/base/packages/SettingsProvider/res/values/defaults.xml b/overlay/common/frameworks/base/packages/SettingsProvider/res/values/defaults.xml
index 5036580..80061a3 100644
--- a/overlay/common/frameworks/base/packages/SettingsProvider/res/values/defaults.xml
+++ b/overlay/common/frameworks/base/packages/SettingsProvider/res/values/defaults.xml
@@ -19,10 +19,13 @@
 <resources>
     <string name="def_backup_transport">com.google.android.backup/.BackupTransportService</string>
 
-    <!-- Circle -->
+    <!-- Circle
     <integer name="def_battery_style">2</integer>
-    <!-- Enable notification counters in statusbar -->
+    -->
+    <!-- Enable notification counters in statusbar
     <integer name="def_notif_count">1</integer>
-    <!-- Right QS pulldown -->
+    -->
+    <!-- Right QS pulldown
     <integer name="def_qs_quick_pulldown">1</integer>
+    -->
 </resources>
diff --git a/overlay/common/packages/providers/TelephonyProvider/res/values-mcc310-mnc260/config.xml b/overlay/common/packages/providers/TelephonyProvider/res/values-mcc310-mnc260/config.xml
index 1e4d855..8c2fd52 100644
--- a/overlay/common/packages/providers/TelephonyProvider/res/values-mcc310-mnc260/config.xml
+++ b/overlay/common/packages/providers/TelephonyProvider/res/values-mcc310-mnc260/config.xml
@@ -17,7 +17,8 @@
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
 
     <!-- The preferred APN to use, in the format name,mcc,mnc
-         Leave empty to choose automatically. -->
+         Leave empty to choose automatically.
     <string name="config_preferred_apn">fast.t-mobile.com,310,260</string>
+    -->
 </resources>
 
diff --git a/overlay/common/packages/providers/TelephonyProvider/res/values-mcc310-mnc410/config.xml b/overlay/common/packages/providers/TelephonyProvider/res/values-mcc310-mnc410/config.xml
index 9f82f18..e68e9f9 100644
--- a/overlay/common/packages/providers/TelephonyProvider/res/values-mcc310-mnc410/config.xml
+++ b/overlay/common/packages/providers/TelephonyProvider/res/values-mcc310-mnc410/config.xml
@@ -17,7 +17,8 @@
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
 
     <!-- The preferred APN to use, in the format name,mcc,mnc
-         Leave empty to choose automatically. -->
+         Leave empty to choose automatically.
     <string name="config_preferred_apn">pta,310,410</string>
+    -->
 </resources>
 
diff --git a/overlay/common/packages/providers/TelephonyProvider/res/values-mcc450-mnc08/config.xml b/overlay/common/packages/providers/TelephonyProvider/res/values-mcc450-mnc08/config.xml
index afa0363..6bcbaa7 100644
--- a/overlay/common/packages/providers/TelephonyProvider/res/values-mcc450-mnc08/config.xml
+++ b/overlay/common/packages/providers/TelephonyProvider/res/values-mcc450-mnc08/config.xml
@@ -17,7 +17,8 @@
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
 
     <!-- The preferred APN to use, in the format name,mcc,mnc
-         Leave empty to choose automatically. -->
+         Leave empty to choose automatically.
     <string name="config_preferred_apn">lte.ktfwing.com,450,08</string>
+    -->
 </resources>