Re-added necessary imports for remote client

* Re-added imports that are being used dynamically to create
  an instance of the correct client. This is not a good implementation
  and will be refactored in a near future pull request

Change-Id: I8f3676db2dfc286c21380f77204cadc5a853ed12
Merge "Re-added necessary imports for remote client"