Merge "Fix NPE on devices that don't have NFC." into ics-mr1