[coastguard skipped] Merge sparse cherrypicks from sparse-12621605-L35300030007705978 into 24Q4-release.

COASTGUARD_SKIP: Id0f6decd750dcb8522d3aac0b756a2bb7207c263

Change-Id: Ia92916a0f96a06d4290f161f619e7516466e1e9d
diff --git a/core/build_id.mk b/core/build_id.mk
index 45671a4..fcc0f39 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=AP4A.241205.013.A1
+BUILD_ID=AP4A.241205.013