Move to room service

Change-Id: I6502a0bb53da58932d054819ee0fa6c5369276b5