Hammerhead: Fix for roomservice

Change-Id: Id8129697d177cff4b9d868c0634f7ce4212cde30