Merge "[DO NOT MERGE] Updating Security String to 2017-09-01 Bug:63846344" into mnc-dev am: 65b4d916e6 am: 60d6fe7552 am: cfbb865e29 am: 2d28e0372a  -s ours am: 15d200c399
am: 0d1b7e183d

Change-Id: Ifc5eec2c2b43745f0d7bc61a670bc5c4b4cbdece