diff --git a/overlay/common/frameworks/base/core/res/res/values/cm_arrays.xml b/overlay/common/frameworks/base/core/res/res/values/cm_arrays.xml
index 3cc10111..e3e0244e 100644
--- a/overlay/common/frameworks/base/core/res/res/values/cm_arrays.xml
+++ b/overlay/common/frameworks/base/core/res/res/values/cm_arrays.xml
@@ -15,10 +15,12 @@
      limitations under the License.
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+<!--
     <string-array name="config_enabledPreinstalledCarrierApps" translatable="false">
         <item>com.cyanogen.ambient.core</item>
         <item>com.cyanogen.ambient.updater</item>
         <item>com.cyngn.devicemanager</item>
         <item>com.cyngn.discovery</item>
     </string-array>
-</resources>
\ No newline at end of file
+-->
+</resources>
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 403890ed..06e1ab0a 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$Receiver</item>
@@ -33,13 +33,13 @@
         <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>
         <item>com.google.android.gms/com.google.android.gms.update.SystemUpdateService$SecretCodeReceiver</item>
-    </string-array>
+    </string-array> -->
 
-    <!-- Force enabling of some services that could have been previously disabled -->
+    <!-- Force enabling of some services that could have been previously disabled
     <string-array name="config_forceEnabledComponents" translatable="false">
         <item>com.google.android.gsf/com.google.android.gsf.update.SystemUpdateService</item>
         <item>com.google.android.gms/com.google.android.gms.update.SystemUpdateService</item>
-    </string-array>
+    </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>
@@ -57,6 +57,6 @@
     <!-- Enable lockscreen rotation by default -->
     <bool name="config_enableLockScreenRotation">true</bool>
 
-    <!-- Whether to persist the notification for when a usb drive device is plugged in -->
-    <bool name="config_persistUsbDriveNotification">true</bool>
+    <!-- Whether to persist the notification for when a usb drive device is plugged in
+    <bool name="config_persistUsbDriveNotification">true</bool> -->
 </resources>