Fix build and utilize roomservice

Change-Id: I37431fbe5934c44a9b8724afbbd5d4f1f65ccd88