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 am: 288fd15d69 am: 701dc24fb9 am: 75864440c3 am: 0987d99c90 am: 0edfdf927d  -s ours am: f283419a6c
am: 10c50a7ad6

Change-Id: Id10bdcbda2e1b83882732a3a2d913fb80ed3c78e