Merge changes Ica52e8f0,Id0ee07f9 into nyc-dev am: e39fa5ef8f am: feada74524 am: dbe7ec01c6
am: aed422e05b

Change-Id: Ifd6a64c599d045735f0c85595315679887310f18
diff --git a/core/version_defaults.mk b/core/version_defaults.mk
index 638983f..9ff3565 100644
--- a/core/version_defaults.mk
+++ b/core/version_defaults.mk
@@ -131,7 +131,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-09-05
+    PLATFORM_SECURITY_PATCH := 2017-10-05
 endif
 
 ifeq "" "$(PLATFORM_BASE_OS)"