diff --git a/ambient/AmbientSensePrebuilt.apk b/ambient/AmbientSensePrebuilt.apk
new file mode 100644
index 0000000..57fb3ef
Binary files /dev/null and b/ambient/AmbientSensePrebuilt.apk differ
diff --git a/ambient/Android.mk b/ambient/Android.mk
new file mode 100644
index 0000000..7148cf9
--- /dev/null
+++ b/ambient/Android.mk
@@ -0,0 +1,12 @@
+LOCAL_PATH := $(call my-dir)
+
+include $(CLEAR_VARS)
+LOCAL_MODULE := AmbientSensePrebuilt
+LOCAL_MODULE_OWNER := google
+LOCAL_MODULE_TAGS := optional
+LOCAL_MODULE_CLASS := APPS
+LOCAL_CERTIFICATE := PRESIGNED
+LOCAL_DEX_PREOPT := false
+LOCAL_PRIVILEGED_MODULE := true
+LOCAL_SRC_FILES := $(LOCAL_MODULE).apk
+include $(BUILD_PREBUILT)
diff --git a/ambient/etc/ambient/matcher_tah.leveldb b/ambient/etc/ambient/matcher_tah.leveldb
new file mode 100644
index 0000000..2435e6c
Binary files /dev/null and b/ambient/etc/ambient/matcher_tah.leveldb differ
diff --git a/ambient/etc/firmware/dnd.descriptor b/ambient/etc/firmware/dnd.descriptor
new file mode 100644
index 0000000..e708a5d
Binary files /dev/null and b/ambient/etc/firmware/dnd.descriptor differ
diff --git a/ambient/etc/firmware/dnd.sound_model b/ambient/etc/firmware/dnd.sound_model
new file mode 100644
index 0000000..617e368
Binary files /dev/null and b/ambient/etc/firmware/dnd.sound_model differ
diff --git a/ambient/etc/firmware/music_detector.descriptor b/ambient/etc/firmware/music_detector.descriptor
new file mode 100644
index 0000000..dabc7bb
Binary files /dev/null and b/ambient/etc/firmware/music_detector.descriptor differ
diff --git a/ambient/etc/firmware/music_detector.sound_model b/ambient/etc/firmware/music_detector.sound_model
new file mode 100644
index 0000000..dbdb31c
Binary files /dev/null and b/ambient/etc/firmware/music_detector.sound_model differ
diff --git a/ambient/etc/permissions/AmbientSensePrebuilt.xml b/ambient/etc/permissions/AmbientSensePrebuilt.xml
new file mode 100644
index 0000000..1364d27
--- /dev/null
+++ b/ambient/etc/permissions/AmbientSensePrebuilt.xml
@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  ~ Copyright (C) 2018 CarbonROM
+  ~
+  ~ 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
+  -->
+
+<!--
+This XML file declares which signature|privileged permissions should be granted to AmbientSensePrebuilt
+-->
+<permissions>
+    <privapp-permissions package="com.google.intelligence.sense">
+        <permission name="android.permission.CAPTURE_AUDIO_HOTWORD"/>
+        <permission name="android.permission.INTERACT_ACROSS_USERS"/>
+        <permission name="android.permission.LOCATION_HARDWARE"/>
+        <permission name="android.permission.MANAGE_SOUND_TRIGGER"/>
+        <permission name="android.permission.RECORD_AUDIO"/>
+        <permission name="android.permission.SUBSTITUTE_NOTIFICATION_APP_NAME"/>
+        <permission name="android.permission.WRITE_SECURE_SETTINGS"/>
+    </privapp-permissions>
+</permissions>
+
diff --git a/gapps.mk b/gapps.mk
index c7d7c20..cd54e39 100644
--- a/gapps.mk
+++ b/gapps.mk
@@ -5,3 +5,31 @@ GAPPS_FORCE_PACKAGE_OVERRIDES := true
 GAPPS_FORCE_PIXEL_LAUNCHER := true
 
 $(call inherit-product-if-exists, vendor/opengapps/build/opengapps-packages.mk)
+
+GAPPS_PIXEL2017_CODENAMES += \
+    %muskie \
+    %taimen \
+    %wahoo \
+    %walleye
+
+GAPPS_PIXEL2018_CODENAMES += \
+    %albacore \
+    %blueline \
+    %crosshatch
+
+GAPPS_PIXEL_AMBIENT_CODENAMES += \
+    $(GAPPS_PIXEL2017_CODENAMES) \
+    $(GAPPS_PIXEL2018_CODENAMES)
+
+# Build ambient listening on Pixel 2017 and Pixel 2018 devices
+ifneq ($(filter $(GAPPS_PIXEL_AMBIENT_CODENAMES),$(TARGET_PRODUCT)),)
+PRODUCT_PACKAGES += AmbientSensePrebuilt
+
+PRODUCT_COPY_FILES += \
+    vendor/extra/ambient/etc/ambient/matcher_tah.leveldb:system/etc/ambient/matcher_tah.leveldb \
+    vendor/extra/ambient/etc/firmware/dnd.descriptor:system/etc/firmware/dnd.descriptor \
+    vendor/extra/ambient/etc/firmware/dnd.sound_model:system/etc/firmware/dnd.sound_model \
+    vendor/extra/ambient/etc/firmware/music_detector.descriptor:system/etc/firmware/music_detector.descriptor \
+    vendor/extra/ambient/etc/firmware/music_detector.sound_model:system/etc/firmware/music_detector.sound_model \
+    vendor/extra/ambient/etc/permissions/AmbientSensePrebuilt.xml:system/etc/permissions/AmbientSensePrebuilt.xml
+endif