diff --git a/arm/Android.mk b/arm/Android.mk
index 95d08e6..0690be7 100644
--- a/arm/Android.mk
+++ b/arm/Android.mk
@@ -1,4 +1,4 @@
-# Copyright (C) 2017 The LineageOS Project
+# Copyright (C) 2017-2018 The LineageOS Project
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
diff --git a/arm/BoardConfigVendor.mk b/arm/BoardConfigVendor.mk
index af3855b..0d5a5c8 100644
--- a/arm/BoardConfigVendor.mk
+++ b/arm/BoardConfigVendor.mk
@@ -1,4 +1,4 @@
-# Copyright (C) 2017 The LineageOS Project
+# Copyright (C) 2017-2018 The LineageOS Project
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
diff --git a/arm/arm-vendor.mk b/arm/arm-vendor.mk
index fb75c87..c92dcaa 100644
--- a/arm/arm-vendor.mk
+++ b/arm/arm-vendor.mk
@@ -1,4 +1,4 @@
-# Copyright (C) 2017 The LineageOS Project
+# Copyright (C) 2017-2018 The LineageOS Project
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
diff --git a/arm64/Android.mk b/arm64/Android.mk
index 8c7a92e..bc8f91a 100644
--- a/arm64/Android.mk
+++ b/arm64/Android.mk
@@ -1,4 +1,4 @@
-# Copyright (C) 2017 The LineageOS Project
+# Copyright (C) 2017-2018 The LineageOS Project
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
diff --git a/arm64/BoardConfigVendor.mk b/arm64/BoardConfigVendor.mk
index af3855b..0d5a5c8 100644
--- a/arm64/BoardConfigVendor.mk
+++ b/arm64/BoardConfigVendor.mk
@@ -1,4 +1,4 @@
-# Copyright (C) 2017 The LineageOS Project
+# Copyright (C) 2017-2018 The LineageOS Project
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
diff --git a/arm64/arm64-vendor.mk b/arm64/arm64-vendor.mk
index 556025e..b3621fb 100644
--- a/arm64/arm64-vendor.mk
+++ b/arm64/arm64-vendor.mk
@@ -1,4 +1,4 @@
-# Copyright (C) 2017 The LineageOS Project
+# Copyright (C) 2017-2018 The LineageOS Project
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
diff --git a/common/Android.mk b/common/Android.mk
index 867cc62..e6a7927 100644
--- a/common/Android.mk
+++ b/common/Android.mk
@@ -1,4 +1,4 @@
-# Copyright (C) 2017 The LineageOS Project
+# Copyright (C) 2017-2018 The LineageOS Project
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -16,7 +16,7 @@
 
 LOCAL_PATH := $(call my-dir)
 
-ifneq ($(filter arm arm64 x86,$(TARGET_ARCH)),)
+ifneq ($(filter arm arm64 x86,$(TARGET_DEVICE)),)
 
 include $(CLEAR_VARS)
 LOCAL_MODULE := GoogleCalendarSyncAdapter
@@ -51,6 +51,18 @@ LOCAL_DEX_PREOPT := false
 LOCAL_MODULE_SUFFIX := .apk
 include $(BUILD_PREBUILT)
 
+include $(CLEAR_VARS)
+LOCAL_MODULE := ConfigUpdater
+LOCAL_MODULE_OWNER := gapps
+LOCAL_SRC_FILES := proprietary/priv-app/ConfigUpdater/ConfigUpdater.apk
+LOCAL_CERTIFICATE := PRESIGNED
+LOCAL_MODULE_TAGS := optional
+LOCAL_MODULE_CLASS := APPS
+LOCAL_DEX_PREOPT := false
+LOCAL_MODULE_SUFFIX := .apk
+LOCAL_PRIVILEGED_MODULE := true
+include $(BUILD_PREBUILT)
+
 include $(CLEAR_VARS)
 LOCAL_MODULE := GoogleBackupTransport
 LOCAL_MODULE_OWNER := gapps
@@ -87,18 +99,6 @@ LOCAL_MODULE_SUFFIX := .apk
 LOCAL_PRIVILEGED_MODULE := true
 include $(BUILD_PREBUILT)
 
-include $(CLEAR_VARS)
-LOCAL_MODULE := GoogleLoginService
-LOCAL_MODULE_OWNER := gapps
-LOCAL_SRC_FILES := proprietary/priv-app/GoogleLoginService/GoogleLoginService.apk
-LOCAL_CERTIFICATE := PRESIGNED
-LOCAL_MODULE_TAGS := optional
-LOCAL_MODULE_CLASS := APPS
-LOCAL_DEX_PREOPT := false
-LOCAL_MODULE_SUFFIX := .apk
-LOCAL_PRIVILEGED_MODULE := true
-include $(BUILD_PREBUILT)
-
 include $(CLEAR_VARS)
 LOCAL_MODULE := GoogleOneTimeInitializer
 LOCAL_MODULE_OWNER := gapps
@@ -169,24 +169,4 @@ LOCAL_MODULE_CLASS := JAVA_LIBRARIES
 LOCAL_MODULE_SUFFIX := .jar
 include $(BUILD_PREBUILT)
 
-include $(CLEAR_VARS)
-LOCAL_MODULE := com.google.android.media.effects
-LOCAL_MODULE_OWNER := gapps
-LOCAL_SRC_FILES := proprietary/framework/com.google.android.media.effects.jar
-LOCAL_CERTIFICATE := PRESIGNED
-LOCAL_MODULE_TAGS := optional
-LOCAL_MODULE_CLASS := JAVA_LIBRARIES
-LOCAL_MODULE_SUFFIX := .jar
-include $(BUILD_PREBUILT)
-
-include $(CLEAR_VARS)
-LOCAL_MODULE := com.google.widevine.software.drm
-LOCAL_MODULE_OWNER := gapps
-LOCAL_SRC_FILES := proprietary/framework/com.google.widevine.software.drm.jar
-LOCAL_CERTIFICATE := PRESIGNED
-LOCAL_MODULE_TAGS := optional
-LOCAL_MODULE_CLASS := JAVA_LIBRARIES
-LOCAL_MODULE_SUFFIX := .jar
-include $(BUILD_PREBUILT)
-
 endif
diff --git a/common/BoardConfigVendor.mk b/common/BoardConfigVendor.mk
index af3855b..0d5a5c8 100644
--- a/common/BoardConfigVendor.mk
+++ b/common/BoardConfigVendor.mk
@@ -1,4 +1,4 @@
-# Copyright (C) 2017 The LineageOS Project
+# Copyright (C) 2017-2018 The LineageOS Project
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
diff --git a/common/common-vendor.mk b/common/common-vendor.mk
index 3caef9c..30df4c5 100644
--- a/common/common-vendor.mk
+++ b/common/common-vendor.mk
@@ -1,4 +1,4 @@
-# Copyright (C) 2017 The LineageOS Project
+# Copyright (C) 2017-2018 The LineageOS Project
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -15,27 +15,21 @@
 # This file is generated by device/gapps//setup-makefiles.sh
 
 PRODUCT_COPY_FILES += \
-    vendor/gapps/common/proprietary/etc/permissions/com.android.omadm.service.xml:system/etc/permissions/com.android.omadm.service.xml \
     vendor/gapps/common/proprietary/etc/permissions/com.google.android.maps.xml:system/etc/permissions/com.google.android.maps.xml \
-    vendor/gapps/common/proprietary/etc/permissions/com.google.android.media.effects.xml:system/etc/permissions/com.google.android.media.effects.xml \
-    vendor/gapps/common/proprietary/etc/permissions/com.google.widevine.software.drm.xml:system/etc/permissions/com.google.widevine.software.drm.xml \
     vendor/gapps/common/proprietary/etc/sysconfig/google.xml:system/etc/sysconfig/google.xml \
-    vendor/gapps/common/proprietary/etc/sysconfig/google_build.xml:system/etc/sysconfig/google_build.xml \
-    vendor/gapps/common/proprietary/etc/sysconfig/whitelist_com.android.omadm.service.xml:system/etc/sysconfig/whitelist_com.android.omadm.service.xml
+    vendor/gapps/common/proprietary/etc/sysconfig/google_build.xml:system/etc/sysconfig/google_build.xml
 
 PRODUCT_PACKAGES += \
     GoogleCalendarSyncAdapter \
     GoogleContactsSyncAdapter \
     GoogleExtShared \
+    ConfigUpdater \
     GoogleBackupTransport \
     GoogleExtServices \
     GoogleFeedback \
-    GoogleLoginService \
     GoogleOneTimeInitializer \
     GooglePartnerSetup \
     GoogleServicesFramework \
     Phonesky \
     SetupWizard \
-    com.google.android.maps \
-    com.google.android.media.effects \
-    com.google.widevine.software.drm
+    com.google.android.maps
diff --git a/common/proprietary/app/GoogleContactsSyncAdapter/GoogleContactsSyncAdapter.apk b/common/proprietary/app/GoogleContactsSyncAdapter/GoogleContactsSyncAdapter.apk
index 70f3910..5993366 100644
Binary files a/common/proprietary/app/GoogleContactsSyncAdapter/GoogleContactsSyncAdapter.apk and b/common/proprietary/app/GoogleContactsSyncAdapter/GoogleContactsSyncAdapter.apk differ
diff --git a/common/proprietary/app/GoogleExtShared/GoogleExtShared.apk b/common/proprietary/app/GoogleExtShared/GoogleExtShared.apk
index 42628fb..61babbe 100644
Binary files a/common/proprietary/app/GoogleExtShared/GoogleExtShared.apk and b/common/proprietary/app/GoogleExtShared/GoogleExtShared.apk differ
diff --git a/common/proprietary/etc/permissions/com.android.omadm.service.xml b/common/proprietary/etc/permissions/com.android.omadm.service.xml
deleted file mode 100644
index b17e001..0000000
--- a/common/proprietary/etc/permissions/com.android.omadm.service.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<permissions>
-    <assign-permission name="com.android.permission.INJECT_OMADM_SETTINGS" uid="shell" />
-</permissions>
diff --git a/common/proprietary/etc/permissions/com.google.android.media.effects.xml b/common/proprietary/etc/permissions/com.google.android.media.effects.xml
deleted file mode 100644
index ea82b9d..0000000
--- a/common/proprietary/etc/permissions/com.google.android.media.effects.xml
+++ /dev/null
@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2011 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-  
-          http://www.apache.org/licenses/LICENSE-2.0
-  
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-
-<permissions>
-    <library name="com.google.android.media.effects"
-            file="/system/framework/com.google.android.media.effects.jar" />
-
-</permissions>
diff --git a/common/proprietary/etc/permissions/com.google.widevine.software.drm.xml b/common/proprietary/etc/permissions/com.google.widevine.software.drm.xml
deleted file mode 100644
index f75abf9..0000000
--- a/common/proprietary/etc/permissions/com.google.widevine.software.drm.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-      Copyright (C) 2011 Google, Inc.  All Rights Reserved
--->
-<permissions>
-    <library name="com.google.widevine.software.drm"
-        file="/system/framework/com.google.widevine.software.drm.jar"/>
-</permissions>
diff --git a/common/proprietary/etc/sysconfig/google.xml b/common/proprietary/etc/sysconfig/google.xml
index 425f696..b9b3a39 100644
--- a/common/proprietary/etc/sysconfig/google.xml
+++ b/common/proprietary/etc/sysconfig/google.xml
@@ -22,6 +22,20 @@
     <!-- GmsCore must always have network access for GCM and other things. -->
     <allow-in-power-save package="com.google.android.gms" />
     <allow-in-data-usage-save package="com.google.android.gms" />
+    <allow-unthrottled-location package="com.google.android.gms" />
+
+    <!-- OobConfig must always have network access to fetch enterprise and carrier lock config. -->
+    <allow-in-power-save-except-idle package="com.google.android.apps.work.oobconfig" />
+    <allow-in-data-usage-save package="com.google.android.apps.work.oobconfig" />
+
+    <!-- Certain broadcasts must still go to legacy implicit receivers -->
+    <allow-implicit-broadcast action="com.google.android.checkin.CHECKIN_COMPLETE" />
+    <allow-implicit-broadcast action="com.google.gservices.intent.action.GSERVICES_CHANGED" />
+    <allow-implicit-broadcast action="com.google.gservices.intent.action.GSERVICES_OVERRIDE" />
+    <allow-implicit-broadcast action="com.google.android.c2dm.intent.RECEIVE" />
+    <!-- TODO: This is a temporary workaround for allowing GmsCore to receive this broadcast.
+         This can be removed once OneTimeInitializer functionality is moved to GmsCore. -->
+    <allow-implicit-broadcast action="com.google.android.onetimeinitializer.ONE_TIME_INITIALIZED" />
 
     <!-- Play Store likewise must have network access to support other applications. -->
     <allow-in-power-save-except-idle package="com.android.vending" />
@@ -60,6 +74,7 @@
     <system-user-whitelisted-app package="com.google.android.gms" />
     <system-user-whitelisted-app package="com.google.android.gms.policy_auth" />
     <system-user-whitelisted-app package="com.google.android.play.games" />
+    <system-user-whitelisted-app package="com.google.android.tts" />
 
     <!-- These are the packages that are uninstalled for system user -->
     <!-- Apps below are required on all GMS devices -->
@@ -69,10 +84,10 @@
 
     <!-- Whitelist of what components are permitted as backup data transports.  The
          'service' attribute here is a flattened ComponentName string. -->
-    <backup-transport-whitelisted-service
-        service="android/com.android.internal.backup.LocalTransportService" />
     <backup-transport-whitelisted-service
         service="com.google.android.gms/.backup.BackupTransportService" />
     <backup-transport-whitelisted-service
         service="com.google.android.gms/.backup.component.D2dTransportService" />
+
+
 </config>
diff --git a/common/proprietary/etc/sysconfig/google_build.xml b/common/proprietary/etc/sysconfig/google_build.xml
index 76dd743..076061f 100644
--- a/common/proprietary/etc/sysconfig/google_build.xml
+++ b/common/proprietary/etc/sysconfig/google_build.xml
@@ -21,8 +21,4 @@
     <feature name="com.google.android.feature.GOOGLE_EXPERIENCE" />
     <!-- This should declare the version of Exchange that ships -->
     <feature name="com.google.android.feature.EXCHANGE_6_2" />
-
-      <!-- If the tycho app is pre-installed and a matching sim inserted,
-         it temporarily needs internet for messaging, etc -->
-    <allow-in-power-save package="com.google.android.apps.tycho" />
 </config>
diff --git a/common/proprietary/etc/sysconfig/whitelist_com.android.omadm.service.xml b/common/proprietary/etc/sysconfig/whitelist_com.android.omadm.service.xml
deleted file mode 100644
index ef40764..0000000
--- a/common/proprietary/etc/sysconfig/whitelist_com.android.omadm.service.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2015 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-
-<!-- The OMA DM service must be whitelisted so they are always able to run. -->
-<config>
-    <allow-in-power-save package="com.android.omadm.service" />
-</config>
diff --git a/common/proprietary/framework/com.google.android.maps.jar b/common/proprietary/framework/com.google.android.maps.jar
index cf8cdaf..85dc4a0 100644
Binary files a/common/proprietary/framework/com.google.android.maps.jar and b/common/proprietary/framework/com.google.android.maps.jar differ
diff --git a/common/proprietary/framework/com.google.android.media.effects.jar b/common/proprietary/framework/com.google.android.media.effects.jar
deleted file mode 100644
index 5dc9943..0000000
Binary files a/common/proprietary/framework/com.google.android.media.effects.jar and /dev/null differ
diff --git a/common/proprietary/framework/com.google.widevine.software.drm.jar b/common/proprietary/framework/com.google.widevine.software.drm.jar
deleted file mode 100644
index a655e97..0000000
Binary files a/common/proprietary/framework/com.google.widevine.software.drm.jar and /dev/null differ
diff --git a/common/proprietary/priv-app/ConfigUpdater/ConfigUpdater.apk b/common/proprietary/priv-app/ConfigUpdater/ConfigUpdater.apk
new file mode 100644
index 0000000..2e25044
Binary files /dev/null and b/common/proprietary/priv-app/ConfigUpdater/ConfigUpdater.apk differ
diff --git a/common/proprietary/priv-app/GoogleBackupTransport/GoogleBackupTransport.apk b/common/proprietary/priv-app/GoogleBackupTransport/GoogleBackupTransport.apk
index f3e7841..4ec3c26 100644
Binary files a/common/proprietary/priv-app/GoogleBackupTransport/GoogleBackupTransport.apk and b/common/proprietary/priv-app/GoogleBackupTransport/GoogleBackupTransport.apk differ
diff --git a/common/proprietary/priv-app/GoogleExtServices/GoogleExtServices.apk b/common/proprietary/priv-app/GoogleExtServices/GoogleExtServices.apk
index 5c81973..b2ee5a5 100644
Binary files a/common/proprietary/priv-app/GoogleExtServices/GoogleExtServices.apk and b/common/proprietary/priv-app/GoogleExtServices/GoogleExtServices.apk differ
diff --git a/common/proprietary/priv-app/GoogleFeedback/GoogleFeedback.apk b/common/proprietary/priv-app/GoogleFeedback/GoogleFeedback.apk
index 13d2fcb..0634c29 100644
Binary files a/common/proprietary/priv-app/GoogleFeedback/GoogleFeedback.apk and b/common/proprietary/priv-app/GoogleFeedback/GoogleFeedback.apk differ
diff --git a/common/proprietary/priv-app/GoogleLoginService/GoogleLoginService.apk b/common/proprietary/priv-app/GoogleLoginService/GoogleLoginService.apk
deleted file mode 100644
index 5aa2d81..0000000
Binary files a/common/proprietary/priv-app/GoogleLoginService/GoogleLoginService.apk and /dev/null differ
diff --git a/common/proprietary/priv-app/GoogleOneTimeInitializer/GoogleOneTimeInitializer.apk b/common/proprietary/priv-app/GoogleOneTimeInitializer/GoogleOneTimeInitializer.apk
index 7e63956..15f09f9 100644
Binary files a/common/proprietary/priv-app/GoogleOneTimeInitializer/GoogleOneTimeInitializer.apk and b/common/proprietary/priv-app/GoogleOneTimeInitializer/GoogleOneTimeInitializer.apk differ
diff --git a/common/proprietary/priv-app/GooglePartnerSetup/GooglePartnerSetup.apk b/common/proprietary/priv-app/GooglePartnerSetup/GooglePartnerSetup.apk
index fffe326..1d43ff1 100644
Binary files a/common/proprietary/priv-app/GooglePartnerSetup/GooglePartnerSetup.apk and b/common/proprietary/priv-app/GooglePartnerSetup/GooglePartnerSetup.apk differ
diff --git a/common/proprietary/priv-app/GoogleServicesFramework/GoogleServicesFramework.apk b/common/proprietary/priv-app/GoogleServicesFramework/GoogleServicesFramework.apk
index b9cc828..9a90b1e 100644
Binary files a/common/proprietary/priv-app/GoogleServicesFramework/GoogleServicesFramework.apk and b/common/proprietary/priv-app/GoogleServicesFramework/GoogleServicesFramework.apk differ
diff --git a/common/proprietary/priv-app/Phonesky/Phonesky.apk b/common/proprietary/priv-app/Phonesky/Phonesky.apk
index 0616dbb..ed9a53b 100644
Binary files a/common/proprietary/priv-app/Phonesky/Phonesky.apk and b/common/proprietary/priv-app/Phonesky/Phonesky.apk differ
diff --git a/common/proprietary/priv-app/SetupWizard/SetupWizard.apk b/common/proprietary/priv-app/SetupWizard/SetupWizard.apk
index 9afd063..b27a0b5 100644
Binary files a/common/proprietary/priv-app/SetupWizard/SetupWizard.apk and b/common/proprietary/priv-app/SetupWizard/SetupWizard.apk differ
diff --git a/x86/Android.mk b/x86/Android.mk
index a30f650..ae8f13b 100644
--- a/x86/Android.mk
+++ b/x86/Android.mk
@@ -1,4 +1,4 @@
-# Copyright (C) 2017 The LineageOS Project
+# Copyright (C) 2017-2018 The LineageOS Project
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
diff --git a/x86/BoardConfigVendor.mk b/x86/BoardConfigVendor.mk
index af3855b..0d5a5c8 100644
--- a/x86/BoardConfigVendor.mk
+++ b/x86/BoardConfigVendor.mk
@@ -1,4 +1,4 @@
-# Copyright (C) 2017 The LineageOS Project
+# Copyright (C) 2017-2018 The LineageOS Project
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
diff --git a/x86/x86-vendor.mk b/x86/x86-vendor.mk
index 9e6fc13..53a32b3 100644
--- a/x86/x86-vendor.mk
+++ b/x86/x86-vendor.mk
@@ -1,4 +1,4 @@
-# Copyright (C) 2017 The LineageOS Project
+# Copyright (C) 2017-2018 The LineageOS Project
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.