Merge "Rename image_client to images_client"