Move to room service

Change-Id: I69933852dca600ba3674a86936da50d76950947f