Merge "There is no @note javadoc tag."