Merge "Simplify NfcCommand and avoid NullPointerExceptions"