Merge "Adding all nfc vts related things back."