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

Change-Id: Id8b2531e63cdf9a8c21249d313abda258c014363