Move to room service

Change-Id: Ie726c8d5dcd2d147cbe07dcf49a96c9b52c1c813