Merge "Revert "Fixed testcase for Nfc VTS""