Shamu: Fix for roomservice

Change-Id: Ibf7a4c8e1f1289f4284db8d26b5a6181d255d853