Merge "Minor fix for file mime difference in ubuntu"