Move to room service

Change-Id: I33b23ec7d6bcd345f5085ffbc331287de1b5b3a2