am a7db2611: Merge "manta: label boot block device"

* commit 'a7db2611c14c66a965737ba9b5ba08bdc171d0de':
  manta: label boot block device