Merge cherrypicks of [17804723] into sparse-8442990-L64700000954185246.

Change-Id: Ibc2662cc74294e841c80cd4faa70886db31df172
diff --git a/core/build_id.mk b/core/build_id.mk
index 52ccf82..72fb4bd 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=M_2022_05
+BUILD_ID=M_2022_06