am 20856f71: am c9f7890a: Revise some javadocs for NFC; add package description

Merge commit '20856f71d971a85a25307941055fb9543adcdc68'

* commit '20856f71d971a85a25307941055fb9543adcdc68':
  Revise some javadocs for NFC; add package description