Merge "More documentation updates for NFC." into gingerbread