Basics for starting to fix nfc support

Change-Id: If476c78f0c9c6102e7b6810a16db748db52b2b1e
1 file changed