am 63b7360e: Merge "Fix NPE on devices that don\'t have NFC." into ics-mr1

* commit '63b7360e9d8c6fb077bdd00c7ef08f402d5a76ba':
  Fix NPE on devices that don't have NFC.