[coastguard skipped] Merge sparse cherrypicks from sparse-10161073-L49900000960778179 into tm-qpr3-release.
COASTGUARD_SKIP: I2bb1848e16aff436787a5bf43dbea18012d485a7
COASTGUARD_SKIP: I9b94fecbdce0ed3fcfa5bb9674d890e1196a0fbe
Change-Id: I39e3f07bfef31d1b2aac7c7f6532fbbb08d3ab98
diff --git a/core/build_id.mk b/core/build_id.mk
index b82225c..275f714 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=TQ3A.230605.011.Y1
+BUILD_ID=TQ3A.230605.011
diff --git a/core/version_defaults.mk b/core/version_defaults.mk
index 23dce804..60bd4cd 100644
--- a/core/version_defaults.mk
+++ b/core/version_defaults.mk
@@ -103,7 +103,7 @@
# It must be of the form "YYYY-MM-DD" on production devices.
# It must match one of the Android Security Patch Level strings of the Public Security Bulletins.
# If there is no $PLATFORM_SECURITY_PATCH set, keep it empty.
- PLATFORM_SECURITY_PATCH := 2023-07-05
+ PLATFORM_SECURITY_PATCH := 2023-06-05
endif
include $(BUILD_SYSTEM)/version_util.mk