Merge "StorageManager: Properly convert FAT volume identifiers."