[coastguard skipped] Merge sparse cherrypicks from sparse-10099262-L86600000960563267 into tm-qpr3-release.

COASTGUARD_SKIP: I3c3e86941fdff2e8aec8f6adeac5ebde20c4c2d4

Change-Id: Ic6e6fbb7d0c3eddfe6d1c84e0be9bd80893ec926
diff --git a/core/build_id.mk b/core/build_id.mk
index 8780a2f..9eac041 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.009.A1
+BUILD_ID=TQ3A.230605.009