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

Change-Id: I7407e2dd2411bc519a5499cf74c284c3fb74bdf0