[coastguard skipped] Merge sparse cherrypicks from sparse-10316531-L68800000962056696 into tm-qpr3-release.

COASTGUARD_SKIP: I7983ea08008011ba1c56d4e440a8e21360c7b3d6

Change-Id: I5b4d70579f1b56ca541dd91edc15c53544e28ea4
diff --git a/core/build_id.mk b/core/build_id.mk
index 7201d8d..e70e58b 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.230805.001.X1
+BUILD_ID=TQ3A.230805.001