Merge "Dont't check NFCC NCI version for core reset ntf."