am 9688fdf5: am fcf3d12d: Merge "Typo in Javadoc"

* commit '9688fdf51edb82a73e1a6d436bf7bce706c049fb':
  Typo in Javadoc