Merge "Allow mapping of raw block devices to partition names"