[coastguard skipped] Merge sparse cherrypicks from sparse-13010343-L69700030009374823 into 25Q1-release.

COASTGUARD_SKIP: I00ef69849067a04ffaaf6c1837541a5b35adebdd

Change-Id: I6585af6ed05b416a958550d4cf849853455921c9
diff --git a/core/build_id.mk b/core/build_id.mk
index f9795b5..c642e4a 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=BP1A.250305.020.T2
+BUILD_ID=BP1A.250305.020