Merge "Fix NFC permission." into gingerbread