Merge "Remove unused admin_hosts_client"