Cleanup in ApiClientInfo and test

Change-Id: I4814e119f14ed4b7b4123b83ea357fbce9e5c74e
Merge "Cleanup in ApiClientInfo and test"