Merge "Add missing import to the image_client"