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

Change-Id: I132559a9f492d3220ab8861e3575d27cb1635646