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

Change-Id: Id4cb1b9f7811a47a0c2781e54c0571e8d5eaca3f