Merge "Fix up javadoc." into mnc-dev