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

Change-Id: I417423cc171b4906dac7d0707a358b6fc85a02d9