Merge "Add NFC-DEP routing"