Airbob fix backport

Monster Iestynrequested to merge
airbob-fix-backport into next

Backport of toaster's airbob sector fix from our internal repo.

Merge request reports