Fix Security Settings FC

Change-Id: I8b2d6b835649f54cf2e1ef116e9dc10685a8599a