Merge "[DO NOT MERGE] Updating security string to 2017-07-05 on lmp-dev bug:38342695" into lmp-dev
am: 11af5514df  -s ours

Change-Id: If06ae105d14f94816787580e5146bfd38fc85126