Merge "Add missing javadoc param"