Merge "Fixed java doc error"