Merge "Use 'misc_block_device' instead of 'misc_partition'."