Merge "Additional javadoc." into mnc-dev