Merge "Replace NFC_PAYMENT_COMPONENT with NFC_PAYMENT_DEFAULT_COMPONENT in comment."