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 am: 702c3b28f7
am: bbc95c4952  -s ours

Change-Id: I58226eee307c1af90551d406bd9452e06547afcb