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

Change-Id: Ic6b017fd04b00a2cf65336e76386d94cabc8b13a