am 3dce8989: Merge "Revert "Fix annoying (but non-fatal) java doc error.""

* commit '3dce8989346c4504a11e8ecd1fe6dc1a51a1a340':
  Revert "Fix annoying (but non-fatal) java doc error."