Merge "mako: label boot block device"