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

Change-Id: I2b758951b7d5c496cd060621ebda3afe1b72f6ea