Merge "Update the java doc"