BUILD_ID=PI   DO NOT MERGE am: 2ca64ed178
am: c9b793e16e  -s ours

Change-Id: Ib01c917526586c88973a6590c3948289ffbd879f
diff --git a/core/build_id.mk b/core/build_id.mk
index 932e214..0e8e2cf 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.
 
-export BUILD_ID=PI
+export BUILD_ID=MASTER