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

Change-Id: I65dba25b8055f2339723905b06da9723ba4b5f6a