Merge changes I7c8a25a2,Ifb32d061 into oc-dev
am: 683c44c812

Change-Id: Icfaf43620d6adb89d263711d3026c7c91ad08a1c
diff --git a/core/version_defaults.mk b/core/version_defaults.mk
index ba4b9e4..a5af6b7 100644
--- a/core/version_defaults.mk
+++ b/core/version_defaults.mk
@@ -188,7 +188,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-08-05
+      PLATFORM_SECURITY_PATCH := 2017-09-05
 endif
 
 ifndef PLATFORM_BASE_OS