diff --git a/base.mk b/base.mk
index 783343b..109dae3 100644
--- a/base.mk
+++ b/base.mk
@@ -6,6 +6,7 @@ PRODUCT_COPY_FILES := \
 	frameworks/native/data/etc/android.hardware.telephony.ims.xml:system/etc/permissions/android.hardware.telephony.ims.xml \
 	frameworks/native/data/etc/android.hardware.bluetooth.xml:system/etc/permissions/android.hardware.bluetooth.xml \
 	frameworks/native/data/etc/android.hardware.bluetooth_le.xml:system/etc/permissions/android.hardware.bluetooth_le.xml \
+	frameworks/native/data/etc/android.hardware.usb.host.xml:system/etc/permissions/android.hardware.usb.host.xml \
 
 #Use a more decent APN config
 PRODUCT_COPY_FILES += \
diff --git a/gapps.mk b/gapps.mk
index 15e12a9..8b87f82 100644
--- a/gapps.mk
+++ b/gapps.mk
@@ -16,6 +16,22 @@ PRODUCT_PACKAGES += \
 PRODUCT_SYSTEM_DEFAULT_PROPERTIES := $(filter-out ro.boot.vendor.overlay.theme=%,$(PRODUCT_SYSTEM_DEFAULT_PROPERTIES))
 endif
 
+ifneq ($(wildcard vendor/partner_gms),)
+-include vendor/partner_gms/products/gms.mk
+PRODUCT_SHIPPING_API_LEVEL :=
+
+PRODUCT_PACKAGES := $(filter-out CalendarGoogle, $(PRODUCT_PACKAGES))
+PRODUCT_PACKAGES := $(filter-out GoogleContacts, $(PRODUCT_PACKAGES))
+
+PRODUCT_PACKAGES += \
+	phh-gapps-overrides \
+	Chrome \
+	GoogleContactsSyncAdapter \
+	talkback \
+
+PRODUCT_SYSTEM_DEFAULT_PROPERTIES := $(filter-out ro.boot.vendor.overlay.theme=%,$(PRODUCT_SYSTEM_DEFAULT_PROPERTIES))
+endif
+
 ifneq ($(wildcard vendor/opengapps),)
 PRODUCT_COPY_FILES += \
 	device/phh/treble/empty-permission.xml:system/etc/permissions/com.google.android.camera2.xml \