Merge changes I43386a3f,I097c226c

* changes:
  Refactored ContentCaptureService (and infra) to have just one RemoteService.
  Refactored ServiceNameResolver to take userId.