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

Change-Id: I67a568b3e4c55df2fd57dc5af4ac32f3f037bbc9