Merge change 11462

* changes:
  Typo fix in javadoc