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

Change-Id: I2619378284b988335721a9d379efcae9e634e7a8