merge in nyc-mr1-volantis-release history after reset to nyc-mr1-release
diff --git a/core/build_id.mk b/core/build_id.mk
index d54fbc3..a5aff02 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=N9F26Y
+export BUILD_ID=N4F27B
diff --git a/core/version_defaults.mk b/core/version_defaults.mk
index 86a67a1..0b55b3f 100644
--- a/core/version_defaults.mk
+++ b/core/version_defaults.mk
@@ -114,7 +114,7 @@
     #  It must be of the form "YYYY-MM-DD" on production devices.
     #  It must match one of the Android Security Patch Level strings of the Public Security Bulletins.
     #  If there is no $PLATFORM_SECURITY_PATCH set, keep it empty.
-      PLATFORM_SECURITY_PATCH := 2017-04-05
+      PLATFORM_SECURITY_PATCH := 2017-05-05
 endif
 
 ifeq "" "$(PLATFORM_BASE_OS)"