Merge "[DO NOT MERGE] Updating security string to 2017-07-01 in lmp-dev bug:38342695" into lmp-dev am: 18fc68549b  -s ours am: 0a97d3f909 am: ddac9519eb  -s ours
am: 7ad3c1407c

Change-Id: I8564bba5201302290fdca4d3350d0cbc7a97ac7b