bring up for roomservice

Change-Id: Id332e534fcbb7090726c6fdce82e1e85b8c35ee4