roomservice: partially revert

Change-Id: I137a48f01c16ad1f4b06554efdf15ab905eeaf35
Merge "roomservice: partially revert" into lollipop