Merge "Added configuration of NFCC_CONTROL_CONFIG"