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

Change-Id: Ibd6463edf17bebc31ff43676d9a8b22314524577