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 am: 5bb7f611ac am: af68a49351 am: 3365b2ddcf am: 209b690619
am: bd63777288  -s ours

Change-Id: If4269ef0966a99b3bcb216913952b9529fadb38b