[coastguard skipped] Merge sparse cherrypicks from sparse-10025418-L15100000960301099 into tm-qpr3-release.

COASTGUARD_SKIP: I707d33bd28210cf0d74e779e97e4fbf02d454698

Change-Id: Ifc77aee480c639f4716ae4646988c2788abea748
diff --git a/core/build_id.mk b/core/build_id.mk
index 45846d5..414e695 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.006.X1
+BUILD_ID=TQ3A.230605.006