diff --git a/audio/oriole/tuning/bluenote/recording.gatf b/audio/oriole/tuning/bluenote/recording.gatf
index b3fbc82..649a963 100644
Binary files a/audio/oriole/tuning/bluenote/recording.gatf and b/audio/oriole/tuning/bluenote/recording.gatf differ
diff --git a/audio/raven/tuning/bluenote/recording.gatf b/audio/raven/tuning/bluenote/recording.gatf
index b3fbc82..c6756f1 100644
Binary files a/audio/raven/tuning/bluenote/recording.gatf and b/audio/raven/tuning/bluenote/recording.gatf differ
diff --git a/powerstats/oriole/service.cpp b/powerstats/oriole/service.cpp
index f6479f3..ee9d57e 100644
--- a/powerstats/oriole/service.cpp
+++ b/powerstats/oriole/service.cpp
@@ -68,7 +68,7 @@ int main() {
 
     addGs101CommonDataProviders(p);
     addDisplay(p);
-    addNFC(p, "/sys/devices/platform/10960000.hsi2c/i2c-3/3-0008/power_stats");
+    addNFC(p, "/sys/devices/platform/10960000.hsi2c/i2c-3/i2c-st21nfc/power_stats");
 
     const std::string instance = std::string() + PowerStats::descriptor + "/default";
     binder_status_t status = AServiceManager_addService(p->asBinder().get(), instance.c_str());
diff --git a/powerstats/raven/service.cpp b/powerstats/raven/service.cpp
index 4224c1f..6ee27d8 100644
--- a/powerstats/raven/service.cpp
+++ b/powerstats/raven/service.cpp
@@ -110,7 +110,7 @@ int main() {
 
     addGs101CommonDataProviders(p);
     addDisplay(p);
-    addNFC(p, "/sys/devices/platform/10960000.hsi2c/i2c-4/4-0008/power_stats");
+    addNFC(p, "/sys/devices/platform/10960000.hsi2c/i2c-4/i2c-st21nfc/power_stats");
     addUwb(p);
 
     const std::string instance = std::string() + PowerStats::descriptor + "/default";
diff --git a/raven/overlay/frameworks/base/packages/SystemUI/res/values/config.xml b/raven/overlay/frameworks/base/packages/SystemUI/res/values/config.xml
index a213966..5aabc86 100644
--- a/raven/overlay/frameworks/base/packages/SystemUI/res/values/config.xml
+++ b/raven/overlay/frameworks/base/packages/SystemUI/res/values/config.xml
@@ -66,5 +66,10 @@
     <!-- Camera 1 is the front camera on barbet -->
     <string translatable="false" name="config_protectedCameraId">1</string>
 
+    <!-- Comma-separated list of packages to exclude from camera protection. In our case,
+    ignore the gaze detection package -->
+    <string translatable="false" name="config_cameraProtectionExcludedPackages">com.google.android.as</string>
+
+    <bool name="config_enableDisplayCutoutProtection">true</bool>
 </resources>
 
diff --git a/self-extractors_raven/google_devices/staging/Android.mk b/self-extractors_raven/google_devices/staging/Android.mk
index 377d81f..6c17b9d 100644
--- a/self-extractors_raven/google_devices/staging/Android.mk
+++ b/self-extractors_raven/google_devices/staging/Android.mk
@@ -33,6 +33,9 @@ LOCAL_MODULE_OWNER := samsung
 LOCAL_MODULE_CLASS := APPS
 LOCAL_SRC_FILES := $(LOCAL_MODULE).apk
 LOCAL_CERTIFICATE := platform
+LOCAL_LICENSE_KINDS := SPDX-license-identifier-Apache-2.0
+LOCAL_LICENSE_CONDITIONS := notice
+LOCAL_NOTICE_FILE := $(LOCAL_PATH)/../COPYRIGHT $(LOCAL_PATH)/../LICENSE
 include $(BUILD_PREBUILT)
 
 include $(CLEAR_VARS)
@@ -45,6 +48,9 @@ LOCAL_MODULE_OWNER := samsung
 LOCAL_MODULE_CLASS := APPS
 LOCAL_SRC_FILES := $(LOCAL_MODULE).apk
 LOCAL_CERTIFICATE := platform
+LOCAL_LICENSE_KINDS := SPDX-license-identifier-Apache-2.0
+LOCAL_LICENSE_CONDITIONS := notice
+LOCAL_NOTICE_FILE := $(LOCAL_PATH)/../COPYRIGHT $(LOCAL_PATH)/../LICENSE
 include $(BUILD_PREBUILT)
 
 include $(CLEAR_VARS)
@@ -58,6 +64,9 @@ LOCAL_MODULE_OWNER := samsung
 LOCAL_MODULE_CLASS := APPS
 LOCAL_SRC_FILES := $(LOCAL_MODULE).apk
 LOCAL_CERTIFICATE := platform
+LOCAL_LICENSE_KINDS := SPDX-license-identifier-Apache-2.0
+LOCAL_LICENSE_CONDITIONS := notice
+LOCAL_NOTICE_FILE := $(LOCAL_PATH)/../COPYRIGHT $(LOCAL_PATH)/../LICENSE
 include $(BUILD_PREBUILT)
 
 include $(CLEAR_VARS)
@@ -71,6 +80,9 @@ LOCAL_MODULE_OWNER := samsung
 LOCAL_MODULE_CLASS := APPS
 LOCAL_SRC_FILES := $(LOCAL_MODULE).apk
 LOCAL_CERTIFICATE := platform
+LOCAL_LICENSE_KINDS := SPDX-license-identifier-Apache-2.0
+LOCAL_LICENSE_CONDITIONS := notice
+LOCAL_NOTICE_FILE := $(LOCAL_PATH)/../COPYRIGHT $(LOCAL_PATH)/../LICENSE
 include $(BUILD_PREBUILT)
 
 include $(CLEAR_VARS)
@@ -83,6 +95,9 @@ LOCAL_MODULE_OWNER := samsung
 LOCAL_MODULE_CLASS := APPS
 LOCAL_SRC_FILES := $(LOCAL_MODULE).apk
 LOCAL_CERTIFICATE := platform
+LOCAL_LICENSE_KINDS := SPDX-license-identifier-Apache-2.0
+LOCAL_LICENSE_CONDITIONS := notice
+LOCAL_NOTICE_FILE := $(LOCAL_PATH)/../COPYRIGHT $(LOCAL_PATH)/../LICENSE
 include $(BUILD_PREBUILT)
 
 endif