diff --git a/device-oriole.mk b/device-oriole.mk
index 4c2706e..c2a0d58 100644
--- a/device-oriole.mk
+++ b/device-oriole.mk
@@ -17,16 +17,17 @@
 # Restrict the visibility of Android.bp files to improve build analysis time
 $(call inherit-product-if-exists, vendor/google/products/sources_pixel.mk)
 
-TARGET_KERNEL_DIR ?= device/google/raviole-kernel
-TARGET_BOARD_KERNEL_HEADERS := device/google/raviole-kernel/kernel-headers
-
 ifdef RELEASE_GOOGLE_ORIOLE_KERNEL_VERSION
 TARGET_LINUX_KERNEL_VERSION := $(RELEASE_GOOGLE_ORIOLE_KERNEL_VERSION)
 endif
 
 ifdef RELEASE_GOOGLE_ORIOLE_KERNEL_DIR
-TARGET_KERNEL_DIR := $(RELEASE_GOOGLE_ORIOLE_KERNEL_DIR)
-TARGET_BOARD_KERNEL_HEADERS := $(RELEASE_GOOGLE_ORIOLE_KERNEL_DIR)/kernel-headers
+# Keeps flexibility for kasan and ufs builds
+TARGET_KERNEL_DIR ?= $(RELEASE_GOOGLE_ORIOLE_KERNEL_DIR)
+TARGET_BOARD_KERNEL_HEADERS ?= $(RELEASE_GOOGLE_ORIOLE_KERNEL_DIR)/kernel-headers
+else
+TARGET_KERNEL_DIR ?= device/google/raviole-kernel
+TARGET_BOARD_KERNEL_HEADERS ?= device/google/raviole-kernel/kernel-headers
 endif
 
 $(call inherit-product-if-exists, vendor/google_devices/raviole/prebuilts/device-vendor-oriole.mk)
@@ -208,7 +209,7 @@
 
 # Increment the SVN for any official public releases
 PRODUCT_VENDOR_PROPERTIES += \
-    ro.vendor.build.svn=78
+    ro.vendor.build.svn=82
 
 # Set support hide display cutout feature
 PRODUCT_PRODUCT_PROPERTIES += \
diff --git a/device-raven.mk b/device-raven.mk
index 51f3904..1efc369 100644
--- a/device-raven.mk
+++ b/device-raven.mk
@@ -17,16 +17,17 @@
 # Restrict the visibility of Android.bp files to improve build analysis time
 $(call inherit-product-if-exists, vendor/google/products/sources_pixel.mk)
 
-TARGET_KERNEL_DIR ?= device/google/raviole-kernel
-TARGET_BOARD_KERNEL_HEADERS := device/google/raviole-kernel/kernel-headers
-
 ifdef RELEASE_GOOGLE_RAVEN_KERNEL_VERSION
 TARGET_LINUX_KERNEL_VERSION := $(RELEASE_GOOGLE_RAVEN_KERNEL_VERSION)
 endif
 
 ifdef RELEASE_GOOGLE_RAVEN_KERNEL_DIR
-TARGET_KERNEL_DIR := $(RELEASE_GOOGLE_RAVEN_KERNEL_DIR)
-TARGET_BOARD_KERNEL_HEADERS := $(RELEASE_GOOGLE_RAVEN_KERNEL_DIR)/kernel-headers
+# Keeps flexibility for kasan and ufs builds
+TARGET_KERNEL_DIR ?= $(RELEASE_GOOGLE_RAVEN_KERNEL_DIR)
+TARGET_BOARD_KERNEL_HEADERS ?= $(RELEASE_GOOGLE_RAVEN_KERNEL_DIR)/kernel-headers
+else
+TARGET_KERNEL_DIR ?= device/google/raviole-kernel
+TARGET_BOARD_KERNEL_HEADERS ?= device/google/raviole-kernel/kernel-headers
 endif
 
 $(call inherit-product, device/google/raviole/uwb/uwb_calibration_country.mk)
@@ -212,7 +213,7 @@
 
 # Increment the SVN for any official public releases
 PRODUCT_VENDOR_PROPERTIES += \
-    ro.vendor.build.svn=78
+    ro.vendor.build.svn=82
 
 # Set support hide display cutout feature
 PRODUCT_PRODUCT_PROPERTIES += \
diff --git a/raven/overlay/frameworks/base/core/res/res/values/config.xml b/raven/overlay/frameworks/base/core/res/res/values/config.xml
index c8d8730..ea1bd1d 100644
--- a/raven/overlay/frameworks/base/core/res/res/values/config.xml
+++ b/raven/overlay/frameworks/base/core/res/res/values/config.xml
@@ -43,7 +43,9 @@
 
 
     <!-- Radius of the software rounded corners. -->
-    <dimen name="rounded_corner_radius">50px</dimen>
+    <dimen name="rounded_corner_radius">67px</dimen>
+    <dimen name="rounded_corner_radius_top">67px</dimen>
+    <dimen name="rounded_corner_radius_bottom">66px</dimen>
 
     <!-- Adjustment for software rounded corners since corners aren't perfectly round. -->
     <dimen name="rounded_corner_radius_adjustment">5px</dimen>