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

Change-Id: Ia1ee033655a51a8a7734c0626e33ae3ec42bc51a