[coastguard skipped] Merge sparse cherrypicks from sparse-12635929-L51100030007751427 into 24Q4-release.

COASTGUARD_SKIP: I681d3aa539f9ccab607a080c19343891cec1a045

Change-Id: I34b4f95b1a91bc04f5cce6f5366c5d843491b02d
diff --git a/core/build_id.mk b/core/build_id.mk
index 858e3b0..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.A2
+BUILD_ID=AP4A.241205.013