Merge "Separate resource_types_client from images_client"