diff --git a/device-felix.mk b/device-felix.mk
index 5360dee..9ee8feb 100644
--- a/device-felix.mk
+++ b/device-felix.mk
@@ -30,13 +30,13 @@ include device/google/felix/audio/felix/audio-tables.mk
 include hardware/google/pixel/vibrator/cs40l25/device-stereo-specific-revision.mk
 include hardware/google/pixel/vibrator/cs40l26/device-stereo-specific-revision.mk
 include device/google/gs101/bluetooth/bluetooth.mk
-include device/google/gs201/uwb/uwb.mk
 ifeq ($(filter factory_felix, $(TARGET_PRODUCT)),)
+include device/google/gs101/uwb/uwb.mk
 include device/google/felix/uwb/uwb_calibration.mk
 endif
 
-SOONG_CONFIG_lyric_tuning_product := felix
-SOONG_CONFIG_google3a_config_target_device := felix
+$(call soong_config_set,lyric,tuning_product,felix)
+$(call soong_config_set,google3a_config,target_device,felix)
 
 BOARD_SEPOLICY_DIRS += \
     hardware/google/pixel-sepolicy/vibrator/common \
diff --git a/felix/overlay/frameworks/base/core/res/res/values/dimens.xml b/felix/overlay/frameworks/base/core/res/res/values/dimens.xml
new file mode 100644
index 0000000..dfe4515
--- /dev/null
+++ b/felix/overlay/frameworks/base/core/res/res/values/dimens.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+ * Copyright (c) 2022, 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>
+   <!-- for 20dp of padding at 3.5px/dp at default density -->
+    <dimen name="rounded_corner_content_padding">50px</dimen>
+</resources>
diff --git a/felix/overlay/frameworks/base/packages/SystemUI/res/values/dimens.xml b/felix/overlay/frameworks/base/packages/SystemUI/res/values/dimens.xml
index c668d76..a2ea70c 100644
--- a/felix/overlay/frameworks/base/packages/SystemUI/res/values/dimens.xml
+++ b/felix/overlay/frameworks/base/packages/SystemUI/res/values/dimens.xml
@@ -19,9 +19,6 @@
     <!-- Don't need the left side padding due to being inset from the cutout -->
     <dimen name="status_bar_padding_start">0dp</dimen>
 
-   <!-- for 20dp of padding at 3.5px/dp at default density -->
-    <dimen name="rounded_corner_content_padding">50px</dimen>
-
     <!-- the padding on the top of the statusbar (usually 0) -->
     <dimen name="status_bar_padding_top">1px</dimen>
 
diff --git a/manifest.xml b/manifest.xml
index fd1ce3e..b87c09a 100644
--- a/manifest.xml
+++ b/manifest.xml
@@ -134,7 +134,7 @@
     <hal format="hidl">
       <name>vendor.google.google_battery</name>
       <transport>hwbinder</transport>
-      <version>1.1</version>
+      <version>1.2</version>
       <interface>
         <name>IGoogleBattery</name>
         <instance>default</instance>
diff --git a/powerstats/felix/Android.bp b/powerstats/felix/Android.bp
index e3f93cb..b7c146f 100644
--- a/powerstats/felix/Android.bp
+++ b/powerstats/felix/Android.bp
@@ -15,7 +15,7 @@
 soong_namespace {
     imports: [
         "hardware/google/pixel",
-        "device/google/gs201",
+        "device/google/gs201/powerstats",
     ]
 }
 
diff --git a/uwb/uwb_calibration.mk b/uwb/uwb_calibration.mk
index d2340e7..5ef15ce 100644
--- a/uwb/uwb_calibration.mk
+++ b/uwb/uwb_calibration.mk
@@ -19,3 +19,4 @@ PRODUCT_COPY_FILES += \
     $(LOCAL_UWB_CAL_DIR)/UWB-calibration.conf:$(TARGET_COPY_OUT_VENDOR)/etc/UWB-calibration.conf \
     $(LOCAL_UWB_CAL_DIR)/UWB-calibration.conf:$(TARGET_COPY_OUT_VENDOR)/etc/UWB-calibration-unknown.conf \
     $(LOCAL_UWB_CAL_DIR)/UWB-calibration.conf:$(TARGET_COPY_OUT_VENDOR)/etc/UWB-calibration-default.conf \
+    vendor/qorvo/uwb/aosp/init.uwb.calib.xtal.sh:$(TARGET_COPY_OUT_VENDOR)/bin/init.uwb.calib.sh \