Cherry pick ccbb5a90 from upstream

Johan Fleuryrequested to merge
Arcaik/libblockdev:feature/cherry-pick-ccbb5a90a16087b1ad24223ca665754778bb15c9 into debian/buster

This fixes #982125.

Please let me know if any changes are needed.

Merge request reports