Change to unbreak roomservice

Change-Id: I9a9d35a6939c18cbe717f8d9c3f8529f27c621d3