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

Change-Id: Ib4973a85bd0ae73cb9d2512ab9e210ca919305f2