Merge changes Id4d040ea,I318fb1fc into mnc-dev am: a2603bd360
am: f5c749c512

Change-Id: I363d1ce470f0d44caf1c12d4843d0f84a87b6f59
diff --git a/core/version_defaults.mk b/core/version_defaults.mk
index 7e12000..f6fb567 100644
--- a/core/version_defaults.mk
+++ b/core/version_defaults.mk
@@ -105,7 +105,7 @@
   #  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)"