Merge "Adding all nfc vts related things back."
am: 42e5d322af

Change-Id: I9f08cea7cef1bb317f7fe4b8913e317f3770b892