Merge "Revert "Fix annoying (but non-fatal) java doc error.""