Re add roomservice feature

Change-Id: Id3a46bb0e4a21836c87412966adb248fe18469ed