Fix to rm roomservice & other local manis

Change-Id: I0df5a902463412545ce5ed627224586618192051