Merge changes from topic 'nfc-vts-split'

* changes:
  Adding all nfc vts related things back.
  Remove all vts nfc related things.