Merge "[DO NOT MERGE] Updating security string to 2017-07-01 in lmp-dev...

Merge "[DO NOT MERGE] Updating security string to 2017-07-01 in lmp-dev bug:38342695" into lmp-dev am: 18fc6854  -s ours am: 0a97d3f9 am: ddac9519  -s ours am: 7ad3c140 am: 16dcd532 am: 535ade48 am: 3f559337  -s ours am: 288fd15d am: 701dc24f am: 75864440 am: 0987d99c am: 0edfdf92  -s ours
am: f283419a

Change-Id: I02a50f6bcd5f8e8d337e1d1c1b8050e62eae6d31