Move to room service

Change-Id: Ibc56955b032b1face148253f2ed1a8391edeb94a