DO NOT MERGE : Update Security String to 2017-05-05 on mnc-dev am: fa157ee487 am: e4ced7a432
am: 84869ab1e2

Change-Id: I9c5be058a27139b73fb331248c682f17a9bfbfe1