am f83d28fc: Merge "hammerhead: label boot block device"

* commit 'f83d28fccf3ba42f47fa0c055ca82c98bba50af6':
  hammerhead: label boot block device