Merge "Add javadoc for the nullable handler parameter"