Merge "Allow update_verifier to access bootctrl_block_device." am: e8b176ed44
am: 7a0b8efe97

* commit '7a0b8efe97c0e54356de42682b1fc8ab57e92cac':
  Allow update_verifier to access bootctrl_block_device.