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

Change-Id: Id563de5f09d1d033751273deb372cc9cc57e2c25