Merge "Minor javadoc cleanup."