Merge "Add content type to LogDataType and getContentType in FileUtil."