diff --git a/universal7885-common/configs/pixel/pixel_2016_exclusive.xml b/universal7885-common/configs/pixel/pixel_2016_exclusive.xml
deleted file mode 100644
index a7e573c..0000000
--- a/universal7885-common/configs/pixel/pixel_2016_exclusive.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<!-- These are configurations that should exist on Google's 2016 Pixel devices. -->
-<config>
-    <!-- Both versions of this string are needed due to a miscommunication. b/29978934 -->
-    <feature name="com.google.android.apps.photos.NEXUS_PRELOAD" />
-    <feature name="com.google.android.apps.photos.nexus_preload" />
-</config>
diff --git a/universal7885-common/configs/pixel/pixel_eureka.xml b/universal7885-common/configs/pixel/pixel_eureka.xml
new file mode 100644
index 0000000..18338d1
--- /dev/null
+++ b/universal7885-common/configs/pixel/pixel_eureka.xml
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<!-- These are configurations that should exist on Google's 2016 and newer Nexus devices. -->
+<config>
+    <!-- This is meant to be the canonical feature identifying 2016 and newer Nexus devices. -->
+    <feature name="com.google.android.feature.PIXEL_EXPERIENCE" />
+
+    <!-- Both versions of this string are needed due to a miscommunication. b/29978934 -->
+    <feature name="com.google.android.apps.photos.NEXUS_PRELOAD" />
+    <feature name="com.google.android.apps.photos.nexus_preload" />
+
+    <!-- Enable Zero Touch Provisioning support for 2016 and newer Nexus devices. -->
+    <feature name="com.google.android.feature.ZERO_TOUCH" />
+
+    <!-- Allow Google unbundled tethering entitlement app in background -->
+    <allow-in-power-save package="com.google.android.tetheringentitlement" />
+
+    <!-- Allow ssr detector service in background -->
+    <allow-in-power-save package="com.google.SSRestartDetector" />
+
+    <!-- Allow ramdump uploader service in background -->
+    <allow-in-power-save package="com.android.ramdump" />
+
+    <!-- These are telephony components that need to run in the background -->
+    <allow-in-power-save package="com.eurekateam.cameralightsensor" />
+</config> 
+
diff --git a/universal7885-common/universal7885-common.mk b/universal7885-common/universal7885-common.mk
index 9ae0b6a..6a6a5f9 100644
--- a/universal7885-common/universal7885-common.mk
+++ b/universal7885-common/universal7885-common.mk
@@ -156,10 +156,7 @@ PRODUCT_COPY_FILES += \
     frameworks/av/media/libstagefright/data/media_codecs_google_audio.xml:$(TARGET_COPY_OUT_VENDOR)/etc/media_codecs_google_audio.xml \
     frameworks/av/media/libstagefright/data/media_codecs_google_telephony.xml:$(TARGET_COPY_OUT_VENDOR)/etc/media_codecs_google_telephony.xml \
     frameworks/av/media/libstagefright/data/media_codecs_google_video.xml:$(TARGET_COPY_OUT_VENDOR)/etc/media_codecs_google_video.xml \
-    frameworks/av/media/libstagefright/data/media_codecs_google_c2.xml:$(TARGET_COPY_OUT_VENDOR)/etc/media_codecs_google_c2.xml \
-    frameworks/av/media/libstagefright/data/media_codecs_google_c2_audio.xml:$(TARGET_COPY_OUT_VENDOR)/etc/media_codecs_google_c2_audio.xml \
-    frameworks/av/media/libstagefright/data/media_codecs_google_c2_video.xml:$(TARGET_COPY_OUT_VENDOR)/etc/media_codecs_google_c2_video.xml
-
+    
 # Memtrack
 PRODUCT_PACKAGES += \
     android.hardware.memtrack@1.0-impl \
@@ -183,7 +180,7 @@ DEVICE_PACKAGE_OVERLAYS += $(LOCAL_PATH)/overlay-derp
 
 # Google Photos
 PRODUCT_COPY_FILES += \
-    $(LOCAL_PATH)/configs/pixel/pixel_2016_exclusive.xml:$(TARGET_COPY_OUT_PRODUCT)/etc/sysconfig/pixel_2016_exclusive.xml
+    $(LOCAL_PATH)/configs/pixel/pixel_eureka.xml:$(TARGET_COPY_OUT_PRODUCT)/etc/sysconfig/pixel_eureka.xml
 
 # Permissions
 PRODUCT_COPY_FILES += \