Improved fix for building device desc

In case of virtual devices (e.g. bridge) without configuration earlier fix didn't work well.

Bnc862378