[coastguard skipped] Merge sparse cherrypicks from sparse-13009785-L02100030009347264 into 25Q1-release.

COASTGUARD_SKIP: Ie88324935fb84bf5ecb647ca02b1e4f3aa9cdeeb

Change-Id: If0f0bad768b0aca8b595680a7777ce363a6c2507
diff --git a/core/build_id.mk b/core/build_id.mk
index 99156f7..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.T1
+BUILD_ID=BP1A.250305.020