Restore roomservice...

Change-Id: Ic91c660d167e4a8bc9013299ec964a6a93ce4788