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
am: d3789031c9

Change-Id: I27d36cb130edbdc8e98ec59a19192f6d111efb1e