Merge "Add persist.nfc property"