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

Change-Id: I3ad84776d1932241a82c7e74b6b7c22273beed74