Move to room service

Change-Id: I9557d7eebbea5fc60b500052785700ecc6388095