More hacks for roomservice to support cozybit

Change-Id: Ied5d222f63acb6fe09f5e6a6cafd10f1f31dddce