Merge "Adddress NFC API review comments." into nyc-dev