Merge "Exclude httpclient to resolve CLM issue"