Fix roomservice to allow dependencies to override each other.

Change-Id: Ifa1d930231d1f83a66bcc2dd5bc3317b86cf2eb8