DO NOT MERGE : Update Security String to 2017-05-01 on klp-dev am: 41d659c467
am: 7b35a39690

Change-Id: Iac15bfd4018b152302e13f12a0f5a05e85d010e4