Fix FC on Security Settings

Change-Id: I69362feb573797c3a96d430adacd64d0d8cd0350