Refactor together with https://github.com/mer-hybris/droid-hal-device/pull/13/files#diff-c5e57a2b0b8037c2b84f5942e90daa16R366 ?