Merge "hammerhead: label boot block device"