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

* commit '66135cbc01ed6823790b32d4af02ebe499b2dbe3':
  Additional javadoc.