[coastguard skipped] Merge sparse cherrypicks from sparse-10204971-L19600000960914226 into tm-qpr3-release.

COASTGUARD_SKIP: I5042629af3bcce0a6da9180ca2a7de6226937567

Change-Id: Ib6f6743344953ca3aea9340b7f6121f1abb5d4c5
diff --git a/core/build_id.mk b/core/build_id.mk
index 68c8d53..9d9a9bc 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.012.A1
+BUILD_ID=TQ3A.230605.012