Merge "Fixed testcase for Nfc VTS"
am: 5446e71b06

Change-Id: I26fcfbbdfede97c0bdb170305c7a09f622270192