Merge "Fix disconnection bug in ServiceWatcher" into rvc-dev am: 4986726503 am: 07cd555bf0

Change-Id: I290fe652d74f55459dce03186b864842989fa67b