Merge change 10364

* changes:
  Fix spelling mistakes in Javadoc