[coastguard skipped] Merge sparse cherrypicks from sparse-9662652-L34400000958984256 into tm-qpr2-release.

COASTGUARD_SKIP: Ibe6d01949102aed6287b037e245515ed06606165

Change-Id: I54c0a108e80dce818c02aad718c456a71a60fe76
diff --git a/core/build_id.mk b/core/build_id.mk
index b9e7255..d19e385 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=TQ2A.230405.002.X1
+BUILD_ID=TQ2A.230405.002