Merge change 2566 into donut

* changes:
  Fix javadoc typos. No code changes.