RoomService: fix intial sync

Change-Id: I1624bddcc7fb8e7383c7c2b0fe13f5f5cb666787
Merge remote-tracking branch 'upstream/jellybean' into jellybean