Merge changes I46d9d8c1,I1ea15c14 into nyc-dev am: 95f77a84d9
am: c1b0be15c4

Change-Id: I2ad666aa08ece76294f80857f94356c696242a4d
diff --git a/core/version_defaults.mk b/core/version_defaults.mk
index e42903a..a0bdcf9 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-06-05
+      PLATFORM_SECURITY_PATCH := 2017-07-05
 endif
 
 ifeq "" "$(PLATFORM_BASE_OS)"