Move to room service

Change-Id: Icf01b52b8905f86beca24a755c14c0452054cb1e