Merge "[DO NOT MERGE] Updating Security String to 2017-09-01 Bug:63846344" into lmp-dev am: 788d85f5ae  -s ours
am: c0d2cfb8b8

Change-Id: I1515e978afcc639ea122253d2ac8a310a3567db2