Merge "Remove base_availability_zone_client for the reability"