Merge "Fix mounting of non-FAT formatted SD cards (2/2)" into o8.0