Merge \"Updating security string to 2016-09-01 to platform and CTS in preparation for 2016 September OTA\" into mnc-dev
am: cb4ba4c90c

Change-Id: I7d4110e803b2775a4009c5adf1d249f98a2d0fa3