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 am: 16dcd532a0
am: 535ade48f8

Change-Id: I3c084d863cb3b091c0e7ebf7783969c9c7125fa1