DO NOT MERGE : Update Security String to 2017-05-01 on mnc-dev am: 07a0f6968d am: 5281508c37 am: bb768aa837 am: 92380f630e  -s ours
am: b62cd71b07

Change-Id: I7e32f977bd071487af2b7b384ce16bc94bf216aa