Merge "Update Security String to 2016-10-05 to Platform and CTS for October Security Updates (rebased)" into mnc-dev