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

Change-Id: I8a51b543b0269b92ca87f80bdc5a91db3dacb84e