Move to room service

Change-Id: I1a0d3d7893877e50bc7bb4b105d802e46b14effd