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

* commit '58c9d4726ebf3165b0dbbcebb1130dfc5502bfe9':
  More documentation updates for NFC.