am ace2942c: Merge "mako: label boot block device"

* commit 'ace2942cb32c3faefb6c39dd75f31f8b695f76e4':
  mako: label boot block device