Merge change 11461

* changes:
  Cosmetic change: cst -> type in javadoc @param