Move to room service

Change-Id: I8f5ec727443e8b27f5b5d17c530dd3f08ea0c924