diff --git a/arm/Android.mk b/arm/Android.mk
index 3d0e0ad..eb3c08d 100644
--- a/arm/Android.mk
+++ b/arm/Android.mk
@@ -1,4 +1,4 @@
-# Copyright (C) 2017-2018 The LineageOS Project
+# Copyright (C) 2017-2019 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 0d5a5c8..488d2ea 100644
--- a/arm/BoardConfigVendor.mk
+++ b/arm/BoardConfigVendor.mk
@@ -1,4 +1,4 @@
-# Copyright (C) 2017-2018 The LineageOS Project
+# Copyright (C) 2017-2019 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 bd32be9..d20c2d5 100644
--- a/arm/arm-vendor.mk
+++ b/arm/arm-vendor.mk
@@ -1,4 +1,4 @@
-# Copyright (C) 2017-2018 The LineageOS Project
+# Copyright (C) 2017-2019 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 c84c48a..e7283e4 100644
--- a/arm64/Android.mk
+++ b/arm64/Android.mk
@@ -1,4 +1,4 @@
-# Copyright (C) 2017-2018 The LineageOS Project
+# Copyright (C) 2017-2019 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 0d5a5c8..488d2ea 100644
--- a/arm64/BoardConfigVendor.mk
+++ b/arm64/BoardConfigVendor.mk
@@ -1,4 +1,4 @@
-# Copyright (C) 2017-2018 The LineageOS Project
+# Copyright (C) 2017-2019 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 84fdd90..6aad52f 100644
--- a/arm64/arm64-vendor.mk
+++ b/arm64/arm64-vendor.mk
@@ -1,4 +1,4 @@
-# Copyright (C) 2017-2018 The LineageOS Project
+# Copyright (C) 2017-2019 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 54db505..604e8a5 100644
--- a/common/Android.mk
+++ b/common/Android.mk
@@ -132,6 +132,17 @@ LOCAL_MODULE_SUFFIX := .jar
 include $(BUILD_PREBUILT)
 
 ifeq ($(TARGET_IS_GROUPER),)
+include $(CLEAR_VARS)
+LOCAL_MODULE := MarkupGoogle
+LOCAL_MODULE_OWNER := gapps
+LOCAL_SRC_FILES := proprietary/app/MarkupGoogle/MarkupGoogle.apk
+LOCAL_CERTIFICATE := PRESIGNED
+LOCAL_MODULE_TAGS := optional
+LOCAL_MODULE_CLASS := APPS
+LOCAL_DEX_PREOPT := false
+LOCAL_MODULE_SUFFIX := .apk
+include $(BUILD_PREBUILT)
+
 include $(CLEAR_VARS)
 LOCAL_MODULE := AndroidMigratePrebuilt
 LOCAL_MODULE_OWNER := gapps
diff --git a/common/BoardConfigVendor.mk b/common/BoardConfigVendor.mk
index 0d5a5c8..488d2ea 100644
--- a/common/BoardConfigVendor.mk
+++ b/common/BoardConfigVendor.mk
@@ -1,4 +1,4 @@
-# Copyright (C) 2017-2018 The LineageOS Project
+# Copyright (C) 2017-2019 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 fbcfe37..1ba3976 100644
--- a/common/common-vendor.mk
+++ b/common/common-vendor.mk
@@ -37,6 +37,7 @@ PRODUCT_PACKAGES += \
 ifeq ($(TARGET_IS_GROUPER),)
 
 PRODUCT_PACKAGES += \
+    MarkupGoogle \
     AndroidMigratePrebuilt \
     SetupWizard
 endif
diff --git a/common/proprietary/app/GoogleContactsSyncAdapter/GoogleContactsSyncAdapter.apk b/common/proprietary/app/GoogleContactsSyncAdapter/GoogleContactsSyncAdapter.apk
index 61f8b98..880d2a0 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/MarkupGoogle/MarkupGoogle.apk b/common/proprietary/app/MarkupGoogle/MarkupGoogle.apk
new file mode 100644
index 0000000..0ef9092
Binary files /dev/null and b/common/proprietary/app/MarkupGoogle/MarkupGoogle.apk differ
diff --git a/common/proprietary/framework/com.google.android.dialer.support.jar b/common/proprietary/framework/com.google.android.dialer.support.jar
index a180799..8e84f2e 100644
Binary files a/common/proprietary/framework/com.google.android.dialer.support.jar and b/common/proprietary/framework/com.google.android.dialer.support.jar differ
diff --git a/common/proprietary/framework/com.google.android.maps.jar b/common/proprietary/framework/com.google.android.maps.jar
index 0371a4f..153e7ca 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/priv-app/GoogleBackupTransport/GoogleBackupTransport.apk b/common/proprietary/priv-app/GoogleBackupTransport/GoogleBackupTransport.apk
index 0183c8e..25b3793 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/GoogleFeedback/GoogleFeedback.apk b/common/proprietary/priv-app/GoogleFeedback/GoogleFeedback.apk
index 33f3a96..af5f86c 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/GooglePartnerSetup/GooglePartnerSetup.apk b/common/proprietary/priv-app/GooglePartnerSetup/GooglePartnerSetup.apk
index 2eb1136..a08dcb0 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 500e0c5..2507a30 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 56963df..f802e18 100644
Binary files a/common/proprietary/priv-app/Phonesky/Phonesky.apk and b/common/proprietary/priv-app/Phonesky/Phonesky.apk differ
diff --git a/proprietary-files-common-nongrouper.txt b/proprietary-files-common-nongrouper.txt
index 94cef06..7661bf5 100644
--- a/proprietary-files-common-nongrouper.txt
+++ b/proprietary-files-common-nongrouper.txt
@@ -1,2 +1,3 @@
+-app/MarkupGoogle/MarkupGoogle.apk;PRESIGNED
 -priv-app/AndroidMigratePrebuilt/AndroidMigratePrebuilt.apk;PRESIGNED|eb965010832814a84afc32db11bf1c89586b78bc
 -priv-app/SetupWizard/SetupWizard.apk;PRESIGNED|cef140e63d5dd861a876b3b24b9e21c82d3749ef
diff --git a/x86/Android.mk b/x86/Android.mk
index c9a0492..fd2a5ab 100644
--- a/x86/Android.mk
+++ b/x86/Android.mk
@@ -1,4 +1,4 @@
-# Copyright (C) 2017-2018 The LineageOS Project
+# Copyright (C) 2017-2019 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 0d5a5c8..488d2ea 100644
--- a/x86/BoardConfigVendor.mk
+++ b/x86/BoardConfigVendor.mk
@@ -1,4 +1,4 @@
-# Copyright (C) 2017-2018 The LineageOS Project
+# Copyright (C) 2017-2019 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 f758d31..da8ecf3 100644
--- a/x86/x86-vendor.mk
+++ b/x86/x86-vendor.mk
@@ -1,4 +1,4 @@
-# Copyright (C) 2017-2018 The LineageOS Project
+# Copyright (C) 2017-2019 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.