Fixup NFC config

Change-Id: I66e95b50ae8e2ea88dcc11faa9927867d838d6af