am 973d9ace: Merge "grouper: label boot block device"

* commit '973d9ace4ab733c2220713d0624e5014bccbf148':
  grouper: label boot block device