Merge change 22470 into eclair

* changes:
  Fix some Javadoc typos.