DO NOT MERGE : Update Security String to 2017-05-05 on lmp-dev am: baf29229ca  -s ours am: 9921f826fe
am: 88ba3a3bf8  -s ours

Change-Id: I938c87c6381b0a9b3879af9ac16c85c82628d6c6