Merge "Fix the v2 image client variable name"