Merge "Fix the typos on the java doc"