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

* commit 'fd335f8467259410c0a55733331e10531141e76e':
  Remove wrong javadoc comment