am 948682d1: am 6e208cdd: Merge "Remove wrong javadoc comment"

* commit '948682d15f1a4a6676318213a49b50b967cfae27':
  Remove wrong javadoc comment