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

Change-Id: Ic92722bd08f326c4c7e99a36ec6b8d4ff6f4caae