Merge "Add an option to explicitly specify blockdev."