Merge "Revert "add NFC component_type""