Move to room service

Change-Id: I7eb2a74c2ecd55056575ade430c00126e462c157