DO NOT MERGE : Update Security String to 2017-05-05 on mnc-dev am: fa157ee487 am: e4ced7a432 am: 84869ab1e2 am: 7723fd8988  -s ours
am: 26c199ecc2

Change-Id: I10a5a2b61f9b39e800f69f71209ce4a0b528e452