Merge "Fixed testcase for Nfc VTS" am: 2a83a41990
am: 49116243dc

Change-Id: I25287ff94a86eaa62ea86a78e3f81b9c5e18a1d6