Merge "Add the 'bdev_type' attribute to all block device types"