[coastguard skipped] Merge sparse cherrypicks from sparse-9595452-L17000000958584414 into tm-qpr2-release.

COASTGUARD_SKIP: Ie5f788a11c263767b7fd15bc4c3fb769642c914b

Change-Id: I5332bdb91c0014982aa0849b4e38b5357c2ee693
diff --git a/core/build_id.mk b/core/build_id.mk
index 39bfce6..f2c871c 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.230305.008.A1
+BUILD_ID=TQ2A.230305.008