[coastguard skipped] Merge sparse cherrypicks from sparse-9719927-L87300000959339500 into tm-qpr2-release.

COASTGUARD_SKIP: I3d0124e7fff91f27a1a9c0a18ede1f94daaf0d8a

Change-Id: I02f990bb0567705453e457be81b5029207b62c9e
diff --git a/core/build_id.mk b/core/build_id.mk
index 3d9e8c3..4adc373 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=TQ2A.230405.003.E1
+BUILD_ID=TQ2A.230405.003