DO NOT MERGE : Update Security String to 2017-05-05 on klp-dev
am: 3d0850957a

Change-Id: I4d62b1d3b809b1be366b649d6cd2cf036f0020b3