diff --git a/aosp_oriole.mk b/aosp_oriole.mk
index 113f679..568d14f 100644
--- a/aosp_oriole.mk
+++ b/aosp_oriole.mk
@@ -23,4 +23,8 @@
 PRODUCT_BRAND := Android
 PRODUCT_MANUFACTURER := Google
 
-PRODUCT_PACKAGES += com.android.vndk.current.on_vendor
+# Keep the VNDK APEX in /system partition for REL branches as these branches are
+# expected to have stable API/ABI surfaces.
+ifneq (REL,$(PLATFORM_VERSION_CODENAME))
+  PRODUCT_PACKAGES += com.android.vndk.current.on_vendor
+endif
diff --git a/aosp_raven.mk b/aosp_raven.mk
index f434886..18da783 100644
--- a/aosp_raven.mk
+++ b/aosp_raven.mk
@@ -26,4 +26,8 @@
 PRODUCT_BRAND_FOR_ATTESTATION := google
 PRODUCT_MANUFACTURER := Google
 
-PRODUCT_PACKAGES += com.android.vndk.current.on_vendor
+# Keep the VNDK APEX in /system partition for REL branches as these branches are
+# expected to have stable API/ABI surfaces.
+ifneq (REL,$(PLATFORM_VERSION_CODENAME))
+  PRODUCT_PACKAGES += com.android.vndk.current.on_vendor
+endif
diff --git a/device-oriole.mk b/device-oriole.mk
index 95cc084..07ed0ed 100644
--- a/device-oriole.mk
+++ b/device-oriole.mk
@@ -344,6 +344,10 @@
 # Disable AVF Remote Attestation
 PRODUCT_AVF_REMOTE_ATTESTATION_DISABLED := true
 
+# HBM
+PRODUCT_PACKAGES += \
+    HbmSVManagerOverlay
+
 # Bluetooth device id
 # Oriole: 0x4106
 PRODUCT_PRODUCT_PROPERTIES += \
diff --git a/oriole/overlay/frameworks/base/core/res/res/values/config.xml b/oriole/overlay/frameworks/base/core/res/res/values/config.xml
index c280a88..f16cfac 100644
--- a/oriole/overlay/frameworks/base/core/res/res/values/config.xml
+++ b/oriole/overlay/frameworks/base/core/res/res/values/config.xml
@@ -93,7 +93,7 @@
     <!-- Height of the status bar.
          Do not read this dimen directly. Use {@link SystemBarUtils#getStatusBarHeight} instead.
          -->
-    <dimen name="status_bar_height_height_default">74px</dimen>
+    <dimen name="status_bar_height_default">74px</dimen>
     <dimen name="status_bar_height_portrait">128px</dimen>
     <dimen name="status_bar_height_landscape">74px</dimen>
 
diff --git a/oriole/rro_overlays/HbmSVManagerOverlay/Android.bp b/oriole/rro_overlays/HbmSVManagerOverlay/Android.bp
new file mode 100644
index 0000000..5ca5189
--- /dev/null
+++ b/oriole/rro_overlays/HbmSVManagerOverlay/Android.bp
@@ -0,0 +1,8 @@
+package {
+    default_applicable_licenses: ["Android-Apache-2.0"],
+}
+
+runtime_resource_overlay {
+    name: "HbmSVManagerOverlay",
+    vendor: true
+}
diff --git a/oriole/rro_overlays/HbmSVManagerOverlay/AndroidManifest.xml b/oriole/rro_overlays/HbmSVManagerOverlay/AndroidManifest.xml
new file mode 100644
index 0000000..b8e8d1f
--- /dev/null
+++ b/oriole/rro_overlays/HbmSVManagerOverlay/AndroidManifest.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+    package="com.android.hbmsvmanager.overlay">
+
+    <overlay
+        android:isStatic="true"
+        android:priority="0"
+        android:targetPackage="com.android.hbmsvmanager" />
+</manifest>
diff --git a/oriole/rro_overlays/HbmSVManagerOverlay/res/drawable/SCI_0_cal0.png b/oriole/rro_overlays/HbmSVManagerOverlay/res/drawable/SCI_0_cal0.png
new file mode 100644
index 0000000..8e5bc72
--- /dev/null
+++ b/oriole/rro_overlays/HbmSVManagerOverlay/res/drawable/SCI_0_cal0.png
Binary files differ
diff --git a/oriole/rro_overlays/HbmSVManagerOverlay/res/drawable/SCI_1_cal0.png b/oriole/rro_overlays/HbmSVManagerOverlay/res/drawable/SCI_1_cal0.png
new file mode 100644
index 0000000..1348949
--- /dev/null
+++ b/oriole/rro_overlays/HbmSVManagerOverlay/res/drawable/SCI_1_cal0.png
Binary files differ
diff --git a/oriole/rro_overlays/HbmSVManagerOverlay/res/drawable/SCI_2_cal0.png b/oriole/rro_overlays/HbmSVManagerOverlay/res/drawable/SCI_2_cal0.png
new file mode 100644
index 0000000..6c4da6a
--- /dev/null
+++ b/oriole/rro_overlays/HbmSVManagerOverlay/res/drawable/SCI_2_cal0.png
Binary files differ
diff --git a/oriole/rro_overlays/HbmSVManagerOverlay/res/drawable/SCI_3_cal0.png b/oriole/rro_overlays/HbmSVManagerOverlay/res/drawable/SCI_3_cal0.png
new file mode 100644
index 0000000..a1df501
--- /dev/null
+++ b/oriole/rro_overlays/HbmSVManagerOverlay/res/drawable/SCI_3_cal0.png
Binary files differ
diff --git a/oriole/rro_overlays/HbmSVManagerOverlay/res/drawable/SCI_4_cal0.png b/oriole/rro_overlays/HbmSVManagerOverlay/res/drawable/SCI_4_cal0.png
new file mode 100644
index 0000000..809e71c
--- /dev/null
+++ b/oriole/rro_overlays/HbmSVManagerOverlay/res/drawable/SCI_4_cal0.png
Binary files differ
diff --git a/oriole/rro_overlays/HbmSVManagerOverlay/res/drawable/SCI_5_cal0.png b/oriole/rro_overlays/HbmSVManagerOverlay/res/drawable/SCI_5_cal0.png
new file mode 100644
index 0000000..bd4ec05
--- /dev/null
+++ b/oriole/rro_overlays/HbmSVManagerOverlay/res/drawable/SCI_5_cal0.png
Binary files differ
diff --git a/oriole/rro_overlays/HbmSVManagerOverlay/res/drawable/SCI_6_cal0.png b/oriole/rro_overlays/HbmSVManagerOverlay/res/drawable/SCI_6_cal0.png
new file mode 100644
index 0000000..3a2779f
--- /dev/null
+++ b/oriole/rro_overlays/HbmSVManagerOverlay/res/drawable/SCI_6_cal0.png
Binary files differ
diff --git a/oriole/rro_overlays/HbmSVManagerOverlay/res/values/config.xml b/oriole/rro_overlays/HbmSVManagerOverlay/res/values/config.xml
new file mode 100644
index 0000000..e850ae7
--- /dev/null
+++ b/oriole/rro_overlays/HbmSVManagerOverlay/res/values/config.xml
@@ -0,0 +1,50 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+/*
+** Copyright 2020, The Android Open Source Project
+**
+** 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.
+*/
+-->
+
+<resources>
+    <string-array name="config_calibrated_compensation_images">
+        <item>SCI_0_cal0.png</item>
+        <item>SCI_1_cal0.png</item>
+        <item>SCI_2_cal0.png</item>
+        <item>SCI_3_cal0.png</item>
+        <item>SCI_4_cal0.png</item>
+        <item>SCI_5_cal0.png</item>
+        <item>SCI_6_cal0.png</item>
+    </string-array>
+    <array name="config_compensation_images">
+        <item>@drawable/SCI_0_cal0</item>
+        <item>@drawable/SCI_1_cal0</item>
+        <item>@drawable/SCI_2_cal0</item>
+        <item>@drawable/SCI_3_cal0</item>
+        <item>@drawable/SCI_4_cal0</item>
+        <item>@drawable/SCI_5_cal0</item>
+        <item>@drawable/SCI_6_cal0</item>
+    </array>
+    <integer name="config_compensation_filter_horizon">1500</integer>
+    <dimen name="config_compensation_filter_intercept">10.0</dimen>
+    <array name="config_compensation_thresholds">
+        <item>15000.0</item>
+        <item>30000.0</item>
+        <item>45000.0</item>
+        <item>60000.0</item>
+        <item>70000.0</item>
+        <item>80000.0</item>
+        <item>100000.0</item>
+    </array>
+</resources>
diff --git a/permissions/permissions_com.android.hbmsvmanager.xml b/permissions/permissions_com.android.hbmsvmanager.xml
new file mode 100644
index 0000000..052265d
--- /dev/null
+++ b/permissions/permissions_com.android.hbmsvmanager.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- for the partition: /system_ext -->
+<permissions>
+    <privapp-permissions package="com.android.hbmsvmanager">
+        <permission name="android.permission.INTERACT_ACROSS_USERS_FULL"/>
+        <permission name="android.permission.MANAGE_USERS"/>
+    </privapp-permissions>
+</permissions>
diff --git a/permissions/permissions_com.google.android.apps.camera.services.xml b/permissions/permissions_com.google.android.apps.camera.services.xml
new file mode 100644
index 0000000..161c871
--- /dev/null
+++ b/permissions/permissions_com.google.android.apps.camera.services.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- for the partition: /product -->
+<permissions>
+    <privapp-permissions package="com.google.android.apps.camera.services">
+        <permission name="android.permission.MODIFY_AUDIO_ROUTING"/>
+        <permission name="android.permission.CAPTURE_AUDIO_OUTPUT"/>
+        <permission name="android.permission.INTERACT_ACROSS_USERS"/>
+    </privapp-permissions>
+</permissions>
diff --git a/permissions/permissions_com.google.android.euicc.xml b/permissions/permissions_com.google.android.euicc.xml
new file mode 100644
index 0000000..e7ab43c
--- /dev/null
+++ b/permissions/permissions_com.google.android.euicc.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- for the partition: /product -->
+<permissions>
+    <privapp-permissions package="com.google.android.euicc">
+        <permission name="android.permission.CONNECTIVITY_USE_RESTRICTED_NETWORKS"/>
+        <permission name="android.permission.CHANGE_COMPONENT_ENABLED_STATE"/>
+        <permission name="android.permission.MODIFY_PHONE_STATE"/>
+        <permission name="android.permission.READ_PRIVILEGED_PHONE_STATE"/>
+        <permission name="android.permission.REBOOT"/>
+        <permission name="android.permission.START_ACTIVITIES_FROM_BACKGROUND"/>
+        <permission name="android.permission.START_FOREGROUND_SERVICES_FROM_BACKGROUND"/>
+        <permission name="android.permission.WRITE_EMBEDDED_SUBSCRIPTIONS"/>
+        <permission name="android.permission.WRITE_SECURE_SETTINGS"/>
+        <permission name="com.android.permission.INSTALL_EXISTING_PACKAGES"/>
+    </privapp-permissions>
+
+</permissions>
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 ea1bd1d..5e605da 100644
--- a/raven/overlay/frameworks/base/core/res/res/values/config.xml
+++ b/raven/overlay/frameworks/base/core/res/res/values/config.xml
@@ -196,7 +196,7 @@
          Do not read this dimen directly. Use {@link SystemBarUtils#getStatusBarHeight} instead.
          -->
     <dimen name="status_bar_height_default">28dp</dimen>
-    <dimen name="status_bar_height_portrait">145px</dimen>
+    <dimen name="status_bar_height_portrait">41.42857143dp</dimen>
     <dimen name="status_bar_height_landscape">28dp</dimen>
 
     <!-- If face auth sends the user directly to home/last open app, or stays on keyguard by default-->
diff --git a/the_experiences.xml b/the_experiences.xml
new file mode 100644
index 0000000..a5b67d7
--- /dev/null
+++ b/the_experiences.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<config>
+    <!-- For Google Camera -->
+    <feature name="com.google.android.feature.GOOGLE_EXPERIENCE" />
+    <feature name="com.google.android.feature.PIXEL_EXPERIENCE" />
+    <feature name="com.google.android.feature.PIXEL_2017_EXPERIENCE" />
+    <feature name="com.google.android.feature.PIXEL_2018_EXPERIENCE" />
+    <feature name="com.google.android.feature.PIXEL_2019_MIDYEAR_EXPERIENCE" />
+    <feature name="com.google.android.feature.PIXEL_2019_EXPERIENCE" />
+    <feature name="com.google.android.feature.PIXEL_2020_MIDYEAR_EXPERIENCE" />
+    <feature name="com.google.android.feature.PIXEL_2020_EXPERIENCE" />
+    <feature name="com.google.android.feature.PIXEL_2021_MIDYEAR_EXPERIENCE" />
+    <feature name="com.google.android.feature.PIXEL_2021_EXPERIENCE" />
+    <feature name="com.google.android.feature.PIXEL_2022_MIDYEAR_EXPERIENCE" />
+    <feature name="com.google.android.feature.PIXEL_2022_EXPERIENCE" />
+</config>