am c1cc9ba6: am 58c9d472: Merge "More documentation updates for NFC." into gingerbread

* commit 'c1cc9ba6d1e2b7f1e213d215e3edb97acea79901':
  More documentation updates for NFC.