diff --git a/core/build_id.mk b/core/build_id.mk
index 4a0992cdc4..861310384f 100644
--- a/core/build_id.mk
+++ b/core/build_id.mk
@@ -18,4 +18,4 @@
 # (like "CRB01").  It must be a single word, and is
 # capitalized by convention.
 
-BUILD_ID=TP1A.220622.001
+BUILD_ID=TP1A.220623.001
diff --git a/target/product/base_system.mk b/target/product/base_system.mk
index 6f6cd79214..c919ac462b 100644
--- a/target/product/base_system.mk
+++ b/target/product/base_system.mk
@@ -52,7 +52,7 @@ PRODUCT_PACKAGES += \
     com.android.adbd \
     com.android.adservices \
     com.android.appsearch \
-    com.android.bluetooth \
+    com.android.btservices \
     com.android.conscrypt \
     com.android.extservices \
     com.android.i18n \