[coastguard skipped] Merge sparse cherrypicks from sparse-9292460-L47800000957470317 into tm-qpr1-release.

Change-Id: Ifa03bf76286e6dd333e47e495f6e1eae1415a476
diff --git a/core/build_id.mk b/core/build_id.mk
index f601483..3529db3 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=TQ1A.230105.001.A2
+BUILD_ID=TQ1A.230105.001