Merge "Fix T110 violations for servers_client"