DO NOT MERGE : Update Security String to 2017-05-01 on lmp-dev am: e0b38c6277  -s ours am: 637f66925f am: 3481be638f  -s ours am: d4f9e95f7c am: 6962385144
am: 128b958afb

Change-Id: I4ff8bdff23c0e3b5ac5637f8c2a90737b35a109d