Merge "Revert "Fixed testcase for Nfc VTS"" am: af4807d656 am: 3c43326dd2
am: 8521d8be40

Change-Id: Ic61aa16376b33c4f146a5e938fc842e54ac567b1