Merge "Fixed minor typo on Javadoc"