Merge changes Ifcb0f60e,I09ecdff9

* changes:
  Nfc adapter randomly returns null on devices having Nfc
  Improve NfcAdapter APIs to report correct nfc state