Merge \\\"Updating security string to 2016-09-01 to platform and CTS in...
Merge \\\"Updating security string to 2016-09-01 to platform and CTS in preparation for 2016 September OTA\\\" into mnc-dev am: cb4ba4c9 am: 942c341a
am: 37688e09
Change-Id: I9c13a7d9f2ab8d96faaea5501131dd3b248fcf91