Roomservice < Bottleservice

Change-Id: Ic38060ebc62c125d76c35ae7aa6df6dedb21f281