Merge "[DO NOT MERGE] Updating security string to 2017-07-05 on lmp-dev bug:38342695" into lmp-dev am: 11af5514df  -s ours am: 4cfcc9fe73 am: 8a893de625  -s ours am: 9f169ddbcd am: 5c7bac6231 am: 1899a63f1d am: e10ce80409  -s ours am: 6a94730d20 am: 70accb9b43 am: 974d64ee8f am: 8b0ad111c3 am: dc36b5a2a9 am: bc75037395  -s ours
am: c49e4d83d9

Change-Id: I9cff7880841b253b32efd5ddbc2eb7aa1951c8d7