Merge "Update javadoc for flags"