Merge "Fix T110 violations for image_client"