[coastguard skipped] Merge sparse cherrypicks from sparse-10216780-L93500000960937337 into tm-qpr3-release.

COASTGUARD_SKIP: Iecb945fdcbebdcc308a327706b7f1ecb5410dfd3

Change-Id: If35d1d8fd317330b930023abcb9fe2d4157a9c62
diff --git a/core/build_id.mk b/core/build_id.mk
index 8a8afc7..0469d88 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.230705.001.A1
+BUILD_ID=TQ3A.230705.001