am b6acf517: Merge "Additional javadoc." into mnc-dev

* commit 'b6acf517ff0c153f54f782d22ba5b498335d933a':
  Additional javadoc.