Merge "Cleanup nfc service code."
am: a91254d196

Change-Id: I5bb71ea5f876bc44519200fc6e640f5cd5b61ebb