Merge "Update the java doc to match the behavior"