Fix typos in Javadoc comments.

PS: please try to merge this commit using a fast-forward commit instead of an explicit merge commit.