Merge "Modify Secure NFC function naming"