am fcf3d12d: Merge "Typo in Javadoc"

* commit 'fcf3d12d701e41d6e46bae8c13776f56d54f90e8':
  Typo in Javadoc