Fix roomservice dependencies

Change-Id: I1cd624dabca98b05d87e2bacbd52a22acf1f2d4b