Merge "Update Security String to 2016-10-05 to Platform and CTS for October...
Merge "Update Security String to 2016-10-05 to Platform and CTS for October Security Updates (rebased)" into mnc-dev am: 5c021503
am: 728d4761
Change-Id: I8896e9674a44bf238569683e1b3e905721a0fb84