Branch roomservice change

Change-Id: I2d2b2b0d4c3c7c500a51213e4b0a246717d6ba97