Merge "Preserve invariant that sService is not null (although NfcAdapter.get() can return null)" into gingerbread