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

Change-Id: Ia0cb9f018e16523ceda39f4475f395e37f92e1f6