Merge "Make image clients use rest_client"