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

* commit 'ac60c3a4cea14aa8dfb2ded91c12c7decf97fc02':
  Allow update_verifier to access bootctrl_block_device.