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

Change-Id: I53784956ca6ec3d1b8f8585bfc547a8bfaee3f3e