Merge "NFC: Update VTS test" am: 3bce41d5ec am: 4d3c1ea989 am: d4cffbf1ec
am: 7b51c28e24

Change-Id: I4123a9bfa33c0a65ddee0d20ab3a316d5171c4cf