Added necessary changes for roomservice

Change-Id: I1f900d2ffc57e3f2df160882e727cb2e999c9eac