This is a reimplementation of a similar patch dropped before. It is done
based on upstream feedback. In oniro, we rely on it for the CI testing
infrastructure.

Signed-off-by: Andrei Gherzan <andrei.gherzan@huawei.com>