Fix device serialization, non configured devices

Change-Id: I8becd696de00dac48a6a8778f063b0d0024fc54b