Let's Roomservice handling devices

Change-Id: I00eed30f10b84bbd98dad2985a49343b16fed15c