Merge "Add additional javadoc for listener parameter."