Remove httpClient and sync with latest changes from mobile-cli-lib