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

Change-Id: I63baa7afd38cd6c3d6852be930aa64df74bb975d
diff --git a/core/version_defaults.mk b/core/version_defaults.mk
index ec86e22..68980e8 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)"