Merge "Update javadoc to correct the typo"