[coastguard skipped] Merge sparse cherrypicks from sparse-9991837-L83700000960209120 into tm-qpr3-release.

COASTGUARD_SKIP: I166c1d0c64fd66ab0affefe6c5678f4f520c2b4f

Change-Id: I68ef07171b06e8a8215516b055d8dce7215b5eb9
diff --git a/core/build_id.mk b/core/build_id.mk
index 97b3ca7..0431d91 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.005.W1
+BUILD_ID=TQ3A.230605.005