Clean up make_client() logging

Change-Id: I0b6760a6401b50e3dfb891af75424ae89df42ebc
Merge "Clean up make_client() logging"