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

Change-Id: I8e569a47820801212ff45aae8cfbd72ca4af6707