Merge "Remove invalid use of kwargs from image clients"