[coastguard skipped] Merge sparse cherrypicks from sparse-12701944-L57500030007960221 into 24Q4-release.

COASTGUARD_SKIP: I2959ed13961bbc5b09444a8442bf0f32c706ea61

Change-Id: Ic52287f868e476743f3cf66b4119ffb46e5bcaee
diff --git a/core/build_id.mk b/core/build_id.mk
index 43bfc7e..ebec06d 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.250105.002.A1
+BUILD_ID=AP4A.250105.002