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  -s ours am: 0ac37045  -s ours am: 0c1c0aa4  -s ours am: e19a6c20  -s ours am: 13f423f0  -s ours am: 49f4c005
am: a7a5c77f

Change-Id: Id919b3b148ebf99d85ab510a62d58a33900f713e