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

Change-Id: I8fb140cf4ec52c19c33d35dcf11518912e30b5fc