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
am: 6137f438b9

Change-Id: Ie33265b8805bd5b15e9f5c31e65c63e8db38f53a