Merge "Remove javadoc for return value"