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

Change-Id: I57bb4f33f18027ca4da8debfa273a62459597391