Merge "Fix Mifare Classic Transaction Fail issue"