bring up for roomservice

Change-Id: I20fe2e473dc27cdb1fd77b5224f3d7961f35c93b