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
am: 3f5593376d  -s ours

Change-Id: I7b94b0638f33d133ea45d69986ac853b613d4f44