Remove CarbonDev, fix roomservice

Change-Id: I4af92f9f738880007f92bed735fecf0f7569cddf