Moving to room service

Change-Id: I999efacd15627af5c343fad802920f1fadb5eeb7