Move to room service

Change-Id: I651e53a2f256caa175a20b7491d23eef046d90d1