[coastguard skipped] Merge sparse cherrypicks from sparse-13003242-L44100030009354266 into 25Q1-release.

COASTGUARD_SKIP: Id6cce159571dbc5adc3efa4639d349c884ac13b4

Change-Id: I63b2b7443296341befd0086acebec3c1a09c8904
diff --git a/core/build_id.mk b/core/build_id.mk
index 6706f33..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.019.W2
+BUILD_ID=BP1A.250305.020