More make_client() logging cleanup

Change-Id: I5af4b9c52c69d6e31e6ca5f90d5880c097880a71
Merge "More make_client() logging cleanup"