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

Change-Id: I46798e396f423639949c0d90d487c1fe01cf3d22