Merge "Cleanup nfc service code." am: a91254d196
am: 8c2e2ce86d

Change-Id: Iec0e3d87ce30625fb5d574817a43e67f51d0a60a