am 92f4f58d: merge from open-source master

Merge commit '92f4f58df944fd10c77e3d39d200c38c1491a941'

* commit '92f4f58df944fd10c77e3d39d200c38c1491a941':
  Typo fix in javadoc
  Cosmetic change: cst -> type in javadoc @param