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

Change-Id: I9a9c1d88f083e3284c0f5aa29c60b436a02991d7